Completed
Push — console-installer ( 3d54e5...e2b50d )
by Adam
69:10 queued 48:24
created
modules/SecurityGroups/SecurityGroupUserRelationship.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -32,14 +32,14 @@
 block discarded – undo
32 32
     
33 33
     var $additional_column_fields = Array();
34 34
         var $field_defs = array (
35
-       'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
36
-      , 'securitygroup_id'=>array('name' =>'securitygroup_id', 'type' =>'char', 'len'=>'36', )
37
-      , 'user_id'=>array('name' =>'user_id', 'type' =>'char', 'len'=>'36',)
38
-      , 'noninheritable'=>array('name' =>'noninheritable', 'type' =>'bool', 'len'=>'1')
39
-      , 'primary_group'=>array('name' =>'primary_group', 'type' =>'bool', 'len'=>'1')
40
-      , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
41
-      , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
42
-      );
35
+        'id'=>array('name' =>'id', 'type' =>'char', 'len'=>'36', 'default'=>'')
36
+        , 'securitygroup_id'=>array('name' =>'securitygroup_id', 'type' =>'char', 'len'=>'36', )
37
+        , 'user_id'=>array('name' =>'user_id', 'type' =>'char', 'len'=>'36',)
38
+        , 'noninheritable'=>array('name' =>'noninheritable', 'type' =>'bool', 'len'=>'1')
39
+        , 'primary_group'=>array('name' =>'primary_group', 'type' =>'bool', 'len'=>'1')
40
+        , 'date_modified'=>array ('name' => 'date_modified','type' => 'datetime')
41
+        , 'deleted'=>array('name' =>'deleted', 'type' =>'bool', 'len'=>'1', 'default'=>'0', 'required'=>true)
42
+        );
43 43
     function SecurityGroupUserRelationship() {
44 44
         $this->db = DBManagerFactory::getInstance();
45 45
         $this->dbManager = DBManagerFactory::getInstance();
Please login to merge, or discard this patch.
modules/SecurityGroups/AssignGroups.php 1 patch
Indentation   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -6,113 +6,113 @@  discard block
 block discarded – undo
6 6
 
7 7
 function popup_select(&$bean, $event, $arguments)
8 8
 {
9
-	global $sugar_config;
10
-
11
-	//only process if action is Save (meaning a user has triggered this event and not the portal or automated process)
12
-	if(isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save' 
13
-		&& isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true
14
-		&& empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") {		
15
-		//Upload an attachment to an Email Template and save. If user with multi groups - popup select option
16
-		//it will redirect to notes instead of EmailTemplate and relationship will fail...check below to avoid
17
-		if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
18
-
19
-		if(!empty($_REQUEST['securitygroup_list'])) {
20
-			require_once('modules/SecurityGroups/SecurityGroup.php');
21
-			$groupFocus = new SecurityGroup();
22
-			$security_modules = $groupFocus->getSecurityModules();
23
-			//sanity check
24
-			if(in_array($bean->module_dir,array_keys($security_modules))) {
25
-				//add each group in securitygroup_list to new record
26
-				$rel_name = $groupFocus->getLinkName($bean->module_dir,"SecurityGroups");
27
-
28
-				$bean->load_relationship($rel_name);
29
-				foreach($_REQUEST['securitygroup_list'] as $group_id) {
30
-					$bean->$rel_name->add($group_id);
31
-				}
32
-			}
33
-		} else if(!empty($_REQUEST['dup_checked'])) {
34
-			//well...ShowDuplicates doesn't pass through request vars unless they are defined in the module vardefs
35
-			//so we are screwed here...
36
-			global $current_language;
37
-			$ss_mod_strings = return_module_language($current_language, 'SecurityGroups');	
38
-			unset($_SESSION['securitysuite_error']); //to be safe
39
-			$_SESSION['securitysuite_error'] = $ss_mod_strings['LBL_ERROR_DUPLICATE'];
40
-		}
41
-	}
9
+    global $sugar_config;
10
+
11
+    //only process if action is Save (meaning a user has triggered this event and not the portal or automated process)
12
+    if(isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save' 
13
+        && isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true
14
+        && empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") {		
15
+        //Upload an attachment to an Email Template and save. If user with multi groups - popup select option
16
+        //it will redirect to notes instead of EmailTemplate and relationship will fail...check below to avoid
17
+        if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
18
+
19
+        if(!empty($_REQUEST['securitygroup_list'])) {
20
+            require_once('modules/SecurityGroups/SecurityGroup.php');
21
+            $groupFocus = new SecurityGroup();
22
+            $security_modules = $groupFocus->getSecurityModules();
23
+            //sanity check
24
+            if(in_array($bean->module_dir,array_keys($security_modules))) {
25
+                //add each group in securitygroup_list to new record
26
+                $rel_name = $groupFocus->getLinkName($bean->module_dir,"SecurityGroups");
27
+
28
+                $bean->load_relationship($rel_name);
29
+                foreach($_REQUEST['securitygroup_list'] as $group_id) {
30
+                    $bean->$rel_name->add($group_id);
31
+                }
32
+            }
33
+        } else if(!empty($_REQUEST['dup_checked'])) {
34
+            //well...ShowDuplicates doesn't pass through request vars unless they are defined in the module vardefs
35
+            //so we are screwed here...
36
+            global $current_language;
37
+            $ss_mod_strings = return_module_language($current_language, 'SecurityGroups');	
38
+            unset($_SESSION['securitysuite_error']); //to be safe
39
+            $_SESSION['securitysuite_error'] = $ss_mod_strings['LBL_ERROR_DUPLICATE'];
40
+        }
41
+    }
42 42
 
43
-	else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
44
-		&& empty($bean->fetched_row['id']) && $bean->module_dir == "Users"
45
-		&& isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature' ) { //Bug: 589
43
+    else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
44
+        && empty($bean->fetched_row['id']) && $bean->module_dir == "Users"
45
+        && isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature' ) { //Bug: 589
46 46
 
47
-		//$_REQUEST['return_module'] = $bean->module_dir;
48
-		//$_REQUEST['return_action'] = "DetailView";
49
-		//$_REQUEST['return_id'] = $bean->id;
47
+        //$_REQUEST['return_module'] = $bean->module_dir;
48
+        //$_REQUEST['return_action'] = "DetailView";
49
+        //$_REQUEST['return_id'] = $bean->id;
50 50
 		
51
-		//$_SESSION['securitygroups_popup_'.$bean->module_dir] = $bean->id;
51
+        //$_SESSION['securitygroups_popup_'.$bean->module_dir] = $bean->id;
52 52
 		
53
-		if(!isset($_SESSION['securitygroups_popup'])) {
54
-			$_SESSION['securitygroups_popup'] = array();
55
-		}
56
-		$_SESSION['securitygroups_popup'][] = array(
57
-			'module' => $bean->module_dir,
58
-			'id' => $bean->id
59
-		);
60
-	}
53
+        if(!isset($_SESSION['securitygroups_popup'])) {
54
+            $_SESSION['securitygroups_popup'] = array();
55
+        }
56
+        $_SESSION['securitygroups_popup'][] = array(
57
+            'module' => $bean->module_dir,
58
+            'id' => $bean->id
59
+        );
60
+    }
61 61
 } 
62 62
 
63 63
 
64 64
 function popup_onload($event, $arguments)
65 65
 {
66
-	if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
66
+    if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
67 67
 
68 68
 /** //test user popup
69 69
 	//always have this loaded
70 70
 	echo '<script type="text/javascript" src="modules/SecurityGroups/javascript/popup_relate.js"></script>';
71 71
 */
72
-	global $sugar_config;
72
+    global $sugar_config;
73 73
 
74
-	$module = $_REQUEST['module'];
75
-	$action = $_REQUEST['action'];
74
+    $module = $_REQUEST['module'];
75
+    $action = $_REQUEST['action'];
76 76
 
77
-	if(isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
77
+    if(isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
78 78
 
79
-	if( (
80
-			//(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true)
81
-			//|| 
82
-			($module == "Users" && isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true)
83
-		)
79
+    if( (
80
+            //(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true)
81
+            //|| 
82
+            ($module == "Users" && isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true)
83
+        )
84 84
 	
85
-		//&& isset($_SESSION['securitygroups_popup_'.$module]) && !empty($_SESSION['securitygroups_popup_'.$module])
86
-		&& !empty($_SESSION['securitygroups_popup'])
87
-	) {	
88
-
89
-		foreach($_SESSION['securitygroups_popup'] as $popup_index => $popup) {
90
-			$record_id = $popup['id'];
91
-			$module = $popup['module'];
92
-			unset($_SESSION['securitygroups_popup'][$popup_index]);
85
+        //&& isset($_SESSION['securitygroups_popup_'.$module]) && !empty($_SESSION['securitygroups_popup_'.$module])
86
+        && !empty($_SESSION['securitygroups_popup'])
87
+    ) {	
88
+
89
+        foreach($_SESSION['securitygroups_popup'] as $popup_index => $popup) {
90
+            $record_id = $popup['id'];
91
+            $module = $popup['module'];
92
+            unset($_SESSION['securitygroups_popup'][$popup_index]);
93 93
 			
94
-			require_once('modules/SecurityGroups/SecurityGroup.php');
95
-			$groupFocus = new SecurityGroup();
96
-			if($module == 'Users') {
97
-				$rel_name = "SecurityGroups";
98
-			} else {
99
-				$rel_name = $groupFocus->getLinkName($module,"SecurityGroups");
100
-			}
101
-
102
-				//this only works if on the detail view of the record actually saved...
103
-				//so ajaxui breaks this as it stays on the parent
104
-				$auto_popup = <<<EOQ
94
+            require_once('modules/SecurityGroups/SecurityGroup.php');
95
+            $groupFocus = new SecurityGroup();
96
+            if($module == 'Users') {
97
+                $rel_name = "SecurityGroups";
98
+            } else {
99
+                $rel_name = $groupFocus->getLinkName($module,"SecurityGroups");
100
+            }
101
+
102
+                //this only works if on the detail view of the record actually saved...
103
+                //so ajaxui breaks this as it stays on the parent
104
+                $auto_popup = <<<EOQ
105 105
 <script type="text/javascript" language="javascript">
106 106
 	open_popup("SecurityGroups",600,400,"",true,true,{"call_back_function":"securitysuite_set_return_and_save_background","form_name":"DetailView","field_to_name_array":{"id":"subpanel_id"},"passthru_data":{"module":"$module","record":"$record_id","child_field":"$rel_name","return_url":"","link_field_name":"$rel_name","module_name":"$rel_name","refresh_page":"1"}},"MultiSelect",true);
107 107
 </script>
108 108
 EOQ;
109 109
 
110
-			echo $auto_popup;
110
+            echo $auto_popup;
111 111
 
112
-		}
113
-		unset($_SESSION['securitygroups_popup']);
112
+        }
113
+        unset($_SESSION['securitygroups_popup']);
114 114
 		
115
-	}
115
+    }
116 116
 
117 117
 }
118 118
 
@@ -121,37 +121,37 @@  discard block
 block discarded – undo
121 121
     $action = $_REQUEST['action'];
122 122
     $module = $_REQUEST['module'];
123 123
   
124
-  	$no_mass_assign_list = array("Emails"=>"Emails","ACLRoles"=>"ACLRoles"); //,"Users"=>"Users");
124
+        $no_mass_assign_list = array("Emails"=>"Emails","ACLRoles"=>"ACLRoles"); //,"Users"=>"Users");
125 125
     //check if security suite enabled
126 126
     $action = strtolower($action);
127 127
     if(isset($module) && ($action == "list" || $action == "index" || $action == "listview") 
128
-    	&& (!isset($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] != true)
129
-    	&& !array_key_exists($module,$no_mass_assign_list)
130
-    	) {
131
-   		global $current_user;
132
-   		if(is_admin($current_user) || ACLAction::getUserAccessLevel($current_user->id,"SecurityGroups", 'access') == ACL_ALLOW_ENABLED) {
128
+        && (!isset($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] != true)
129
+        && !array_key_exists($module,$no_mass_assign_list)
130
+        ) {
131
+            global $current_user;
132
+            if(is_admin($current_user) || ACLAction::getUserAccessLevel($current_user->id,"SecurityGroups", 'access') == ACL_ALLOW_ENABLED) {
133 133
 
134
-			require_once('modules/SecurityGroups/SecurityGroup.php');
135
-			$groupFocus = new SecurityGroup();
136
-			$security_modules = $groupFocus->getSecurityModules();
137
-			//if(in_array($module,$security_modules)) {
138
-			if(in_array($module,array_keys($security_modules))) {
134
+            require_once('modules/SecurityGroups/SecurityGroup.php');
135
+            $groupFocus = new SecurityGroup();
136
+            $security_modules = $groupFocus->getSecurityModules();
137
+            //if(in_array($module,$security_modules)) {
138
+            if(in_array($module,array_keys($security_modules))) {
139 139
 
140
-				global $app_strings;
140
+                global $app_strings;
141 141
 
142
-				global $current_language;
143
-				$current_module_strings = return_module_language($current_language, 'SecurityGroups');
142
+                global $current_language;
143
+                $current_module_strings = return_module_language($current_language, 'SecurityGroups');
144 144
 
145
-				$form_header = get_form_header($current_module_strings['LBL_MASS_ASSIGN'], '', false);
145
+                $form_header = get_form_header($current_module_strings['LBL_MASS_ASSIGN'], '', false);
146 146
 
147
-				$groups = $groupFocus->get_list("name","",0,-99,-99);
148
-				$options = array(""=>"");
149
-				foreach($groups['list'] as $group) {
150
-					$options[$group->id] = $group->name;
151
-				}
152
-				$group_options =  get_select_options_with_id($options, "");
147
+                $groups = $groupFocus->get_list("name","",0,-99,-99);
148
+                $options = array(""=>"");
149
+                foreach($groups['list'] as $group) {
150
+                    $options[$group->id] = $group->name;
151
+                }
152
+                $group_options =  get_select_options_with_id($options, "");
153 153
 
154
-				$mass_assign = <<<EOQ
154
+                $mass_assign = <<<EOQ
155 155
 
156 156
 <script type="text/javascript" language="javascript">
157 157
 function confirm_massassign(del,start_string, end_string) {
@@ -264,16 +264,16 @@  discard block
 block discarded – undo
264 264
 EOQ;
265 265
 
266 266
 
267
-				echo $mass_assign;
268
-			}
269
-		}
267
+                echo $mass_assign;
268
+            }
269
+        }
270 270
     }
271 271
 
272
-	//if after a save...
273
-	if(!empty($_SESSION['securitysuite_error'])) {
274
-		$lbl_securitysuite_error = $_SESSION['securitysuite_error'];
275
-		unset($_SESSION['securitysuite_error']);
276
-		echo <<<EOQ
272
+    //if after a save...
273
+    if(!empty($_SESSION['securitysuite_error'])) {
274
+        $lbl_securitysuite_error = $_SESSION['securitysuite_error'];
275
+        unset($_SESSION['securitysuite_error']);
276
+        echo <<<EOQ
277 277
 <script>
278 278
 				
279 279
 
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 document.body.insertBefore(oNewP, beforeMe);
288 288
 </script>
289 289
 EOQ;
290
-	}
290
+    }
291 291
 }
292 292
 
293 293
 }
Please login to merge, or discard this patch.
modules/Contacts/SaveContactOpportunityRelationship.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,12 +57,12 @@
 block discarded – undo
57 57
 
58 58
 foreach($focus->column_fields as $field)
59 59
 {
60
-	safe_map($field, $focus, true);
60
+    safe_map($field, $focus, true);
61 61
 }
62 62
 
63 63
 foreach($focus->additional_column_fields as $field)
64 64
 {
65
-	safe_map($field, $focus, true);
65
+    safe_map($field, $focus, true);
66 66
 }
67 67
 
68 68
 // send them to the edit screen.
Please login to merge, or discard this patch.
modules/Contacts/metadata/additionalDetails.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -40,13 +40,13 @@  discard block
 block discarded – undo
40 40
 
41 41
 
42 42
 function additionalDetailsContact($fields) {
43
-	static $mod_strings;
44
-	if(empty($mod_strings)) {
45
-		global $current_language;
46
-		$mod_strings = return_module_language($current_language, 'Contacts');
47
-	}
43
+    static $mod_strings;
44
+    if(empty($mod_strings)) {
45
+        global $current_language;
46
+        $mod_strings = return_module_language($current_language, 'Contacts');
47
+    }
48 48
 	 
49
-	$overlib_string = '';
49
+    $overlib_string = '';
50 50
     if(!empty($fields['ID'])) {
51 51
         $overlib_string .= '<input type="hidden" value="'. $fields['ID'];
52 52
         $overlib_string .= '">';
@@ -55,35 +55,35 @@  discard block
 block discarded – undo
55 55
     $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Contacts.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
56 56
 
57 57
     if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
58
-		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
59
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
60
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
61
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
62
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
63
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
64
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
65
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
66
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
67
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
68
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
69
-		$overlib_string .= '<br>';  
70
-	if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
71
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
72
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
58
+        !empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
59
+        !empty($fields['PRIMARY_ADDRESS_COUNTRY']))
60
+            $overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
61
+    if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
62
+    if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
63
+    if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
64
+    if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
65
+    if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
66
+    if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
67
+    if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
68
+    if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
69
+        $overlib_string .= '<br>';  
70
+    if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
71
+    if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
72
+    if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
73 73
 
74
-	if(!empty($fields['DATE_MODIFIED'])) $overlib_string .= '<b>'. $mod_strings['LBL_DATE_MODIFIED'] . '</b> ' . $fields['DATE_MODIFIED'] . '<br>';
74
+    if(!empty($fields['DATE_MODIFIED'])) $overlib_string .= '<b>'. $mod_strings['LBL_DATE_MODIFIED'] . '</b> ' . $fields['DATE_MODIFIED'] . '<br>';
75 75
 	
76
-	if(!empty($fields['DESCRIPTION'])) { 
77
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
78
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
79
-	}	
76
+    if(!empty($fields['DESCRIPTION'])) { 
77
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
78
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
79
+    }	
80 80
 	
81
-	return array('fieldToAddTo' => 'NAME', 
82
-				 'string' => $overlib_string, 
83
-				 'editLink' => "index.php?action=EditView&module=Contacts&return_module=Contacts&record={$fields['ID']}", 
84
-				 'viewLink' => "index.php?action=DetailView&module=Contacts&return_module=Contacts&record={$fields['ID']}");
81
+    return array('fieldToAddTo' => 'NAME', 
82
+                    'string' => $overlib_string, 
83
+                    'editLink' => "index.php?action=EditView&module=Contacts&return_module=Contacts&record={$fields['ID']}", 
84
+                    'viewLink' => "index.php?action=DetailView&module=Contacts&return_module=Contacts&record={$fields['ID']}");
85 85
 }
86 86
  
87
- ?>
87
+    ?>
88 88
  
89 89
  
90 90
\ No newline at end of file
Please login to merge, or discard this patch.
modules/Contacts/metadata/popupdefsEmail.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -42,21 +42,21 @@
 block discarded – undo
42 42
 global $mod_strings;
43 43
 
44 44
 $popupMeta = array('moduleMain' => 'Contact',
45
-						'varName' => 'CONTACT',
46
-						'orderBy' => 'contacts.first_name, contacts.last_name',
47
-						'whereClauses' => 
48
-							array('first_name' => 'contacts.first_name', 
49
-									'last_name' => 'contacts.last_name',
50
-									'account_name' => 'accounts.name',
51
-									'account_id' => 'accounts.id'),
52
-						'searchInputs' =>
53
-							array('first_name', 'last_name', 'account_name'),
54
-						'create' =>
55
-							array('formBase' => 'ContactFormBase.php',
56
-									'formBaseClass' => 'ContactFormBase',
57
-									'getFormBodyParams' => array('','','ContactSave'),
58
-									'createButton' => 'LNK_NEW_CONTACT'
59
-								  ),
60
-						'templateForm' => 'modules/Contacts/Email_picker.html',
61
-						);
45
+                        'varName' => 'CONTACT',
46
+                        'orderBy' => 'contacts.first_name, contacts.last_name',
47
+                        'whereClauses' => 
48
+                            array('first_name' => 'contacts.first_name', 
49
+                                    'last_name' => 'contacts.last_name',
50
+                                    'account_name' => 'accounts.name',
51
+                                    'account_id' => 'accounts.id'),
52
+                        'searchInputs' =>
53
+                            array('first_name', 'last_name', 'account_name'),
54
+                        'create' =>
55
+                            array('formBase' => 'ContactFormBase.php',
56
+                                    'formBaseClass' => 'ContactFormBase',
57
+                                    'getFormBodyParams' => array('','','ContactSave'),
58
+                                    'createButton' => 'LNK_NEW_CONTACT'
59
+                                    ),
60
+                        'templateForm' => 'modules/Contacts/Email_picker.html',
61
+                        );
62 62
 ?>
Please login to merge, or discard this patch.
modules/Contacts/metadata/editviewdefs.php 1 patch
Indentation   +93 added lines, -93 removed lines patch added patch discarded remove patch
@@ -39,193 +39,193 @@
 block discarded – undo
39 39
 
40 40
 $viewdefs ['Contacts'] = 
41 41
 array (
42
-  'EditView' => 
43
-  array (
42
+    'EditView' => 
43
+    array (
44 44
     'templateMeta' => 
45 45
     array (
46
-      'form' => 
47
-      array (
46
+        'form' => 
47
+        array (
48 48
         'hidden' => 
49 49
         array (
50
-          0 => '<input type="hidden" name="opportunity_id" value="{$smarty.request.opportunity_id}">',
51
-          1 => '<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
52
-          2 => '<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
53
-          3 => '<input type="hidden" name="email_id" value="{$smarty.request.email_id}">',
54
-          4 => '<input type="hidden" name="inbound_email_id" value="{$smarty.request.inbound_email_id}">',
50
+            0 => '<input type="hidden" name="opportunity_id" value="{$smarty.request.opportunity_id}">',
51
+            1 => '<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
52
+            2 => '<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
53
+            3 => '<input type="hidden" name="email_id" value="{$smarty.request.email_id}">',
54
+            4 => '<input type="hidden" name="inbound_email_id" value="{$smarty.request.inbound_email_id}">',
55
+        ),
55 56
         ),
56
-      ),
57
-      'maxColumns' => '2',
58
-      'widths' => 
59
-      array (
57
+        'maxColumns' => '2',
58
+        'widths' => 
59
+        array (
60 60
         0 => 
61 61
         array (
62
-          'label' => '10',
63
-          'field' => '30',
62
+            'label' => '10',
63
+            'field' => '30',
64 64
         ),
65 65
         1 => 
66 66
         array (
67
-          'label' => '10',
68
-          'field' => '30',
67
+            'label' => '10',
68
+            'field' => '30',
69
+        ),
69 70
         ),
70
-      ),
71
-      'useTabs' => false,
72
-      'tabDefs' => 
73
-      array (
71
+        'useTabs' => false,
72
+        'tabDefs' => 
73
+        array (
74 74
         'LBL_CONTACT_INFORMATION' => 
75 75
         array (
76
-          'newTab' => false,
77
-          'panelDefault' => 'expanded',
76
+            'newTab' => false,
77
+            'panelDefault' => 'expanded',
78 78
         ),
79 79
         'LBL_PANEL_ADVANCED' => 
80 80
         array (
81
-          'newTab' => false,
82
-          'panelDefault' => 'expanded',
81
+            'newTab' => false,
82
+            'panelDefault' => 'expanded',
83
+        ),
83 84
         ),
84
-      ),
85 85
     ),
86 86
     'panels' => 
87 87
     array (
88
-      'lbl_contact_information' => 
89
-      array (
88
+        'lbl_contact_information' => 
89
+        array (
90 90
         0 => 
91 91
         array (
92
-          0 => 
93
-          array (
92
+            0 => 
93
+            array (
94 94
             'name' => 'first_name',
95 95
             'customCode' => '{html_options name="salutation" id="salutation" options=$fields.salutation.options selected=$fields.salutation.value}&nbsp;<input name="first_name"  id="first_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
96
-          ),
97
-          1 => 
98
-          array (
96
+            ),
97
+            1 => 
98
+            array (
99 99
             'name' => 'last_name',
100
-          ),
100
+            ),
101 101
         ),
102 102
         1 => 
103 103
         array (
104
-          0 => 
105
-          array (
104
+            0 => 
105
+            array (
106 106
             'name' => 'phone_work',
107 107
             'comment' => 'Work phone number of the contact',
108 108
             'label' => 'LBL_OFFICE_PHONE',
109
-          ),
110
-          1 => 
111
-          array (
109
+            ),
110
+            1 => 
111
+            array (
112 112
             'name' => 'phone_mobile',
113 113
             'comment' => 'Mobile phone number of the contact',
114 114
             'label' => 'LBL_MOBILE_PHONE',
115
-          ),
115
+            ),
116 116
         ),
117 117
         2 => 
118 118
         array (
119
-          0 => 
120
-          array (
119
+            0 => 
120
+            array (
121 121
             'name' => 'title',
122 122
             'comment' => 'The title of the contact',
123 123
             'label' => 'LBL_TITLE',
124
-          ),
125
-          1 => 'department',
124
+            ),
125
+            1 => 'department',
126 126
         ),
127 127
         3 => 
128 128
         array (
129
-          0 => 
130
-          array (
129
+            0 => 
130
+            array (
131 131
             'name' => 'account_name',
132 132
             'displayParams' => 
133 133
             array (
134
-              'key' => 'billing',
135
-              'copy' => 'primary',
136
-              'billingKey' => 'primary',
137
-              'additionalFields' => 
138
-              array (
134
+                'key' => 'billing',
135
+                'copy' => 'primary',
136
+                'billingKey' => 'primary',
137
+                'additionalFields' => 
138
+                array (
139 139
                 'phone_office' => 'phone_work',
140
-              ),
140
+                ),
141 141
             ),
142
-          ),
143
-          1 => 
144
-          array (
142
+            ),
143
+            1 => 
144
+            array (
145 145
             'name' => 'phone_fax',
146 146
             'comment' => 'Contact fax number',
147 147
             'label' => 'LBL_FAX_PHONE',
148
-          ),
148
+            ),
149 149
         ),
150 150
         4 => 
151 151
         array (
152
-          0 => 
153
-          array (
152
+            0 => 
153
+            array (
154 154
             'name' => 'email1',
155 155
             'studio' => 'false',
156 156
             'label' => 'LBL_EMAIL_ADDRESS',
157
-          ),
157
+            ),
158 158
         ),
159 159
         5 => 
160 160
         array (
161
-          0 => 
162
-          array (
161
+            0 => 
162
+            array (
163 163
             'name' => 'primary_address_street',
164 164
             'hideLabel' => true,
165 165
             'type' => 'address',
166 166
             'displayParams' => 
167 167
             array (
168
-              'key' => 'primary',
169
-              'rows' => 2,
170
-              'cols' => 30,
171
-              'maxlength' => 150,
168
+                'key' => 'primary',
169
+                'rows' => 2,
170
+                'cols' => 30,
171
+                'maxlength' => 150,
172
+            ),
172 173
             ),
173
-          ),
174
-          1 => 
175
-          array (
174
+            1 => 
175
+            array (
176 176
             'name' => 'alt_address_street',
177 177
             'hideLabel' => true,
178 178
             'type' => 'address',
179 179
             'displayParams' => 
180 180
             array (
181
-              'key' => 'alt',
182
-              'copy' => 'primary',
183
-              'rows' => 2,
184
-              'cols' => 30,
185
-              'maxlength' => 150,
181
+                'key' => 'alt',
182
+                'copy' => 'primary',
183
+                'rows' => 2,
184
+                'cols' => 30,
185
+                'maxlength' => 150,
186
+            ),
186 187
             ),
187
-          ),
188 188
         ),
189 189
         6 => 
190 190
         array (
191
-          0 => 
192
-          array (
191
+            0 => 
192
+            array (
193 193
             'name' => 'description',
194 194
             'label' => 'LBL_DESCRIPTION',
195
-          ),
196
-          1 => '',
195
+            ),
196
+            1 => '',
197 197
         ),
198 198
         7 => 
199 199
         array (
200
-          0 => 
201
-          array (
200
+            0 => 
201
+            array (
202 202
             'name' => 'assigned_user_name',
203 203
             'label' => 'LBL_ASSIGNED_TO_NAME',
204
-          ),
204
+            ),
205
+        ),
205 206
         ),
206
-      ),
207
-      'LBL_PANEL_ADVANCED' => 
208
-      array (
207
+        'LBL_PANEL_ADVANCED' => 
208
+        array (
209 209
         0 => 
210 210
         array (
211
-          0 => 
212
-          array (
211
+            0 => 
212
+            array (
213 213
             'name' => 'lead_source',
214 214
             'comment' => 'How did the contact come about',
215 215
             'label' => 'LBL_LEAD_SOURCE',
216
-          ),
216
+            ),
217 217
         ),
218 218
         1 => 
219 219
         array (
220
-          0 => 
221
-          array (
220
+            0 => 
221
+            array (
222 222
             'name' => 'report_to_name',
223 223
             'label' => 'LBL_REPORTS_TO',
224
-          ),
225
-          1 => 'campaign_name',
224
+            ),
225
+            1 => 'campaign_name',
226 226
         ),
227
-      ),
227
+        ),
228
+    ),
228 229
     ),
229
-  ),
230 230
 );
231 231
 ?>
Please login to merge, or discard this patch.
modules/Contacts/metadata/popupdefs.php 1 patch
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -42,56 +42,56 @@
 block discarded – undo
42 42
 global $mod_strings;
43 43
 
44 44
 $popupMeta = array(
45
-	'moduleMain' => 'Contact',
46
-	'varName' => 'CONTACT',
47
-	'orderBy' => 'contacts.first_name, contacts.last_name',
48
-	'whereClauses' => 
49
-		array('first_name' => 'contacts.first_name', 
50
-				'last_name' => 'contacts.last_name',
51
-				'account_name' => 'accounts.name',
52
-				'account_id' => 'accounts.id'),
53
-	'searchInputs' =>
54
-		array('first_name', 'last_name', 'account_name', 'email'),
55
-	'create' =>
56
-		array('formBase' => 'ContactFormBase.php',
57
-				'formBaseClass' => 'ContactFormBase',
58
-				'getFormBodyParams' => array('','','ContactSave'),
59
-				'createButton' => 'LNK_NEW_CONTACT'
60
-			  ),
61
-	'listviewdefs' => array(
62
-		'NAME' => array(
63
-			'width' => '20%', 
64
-			'label' => 'LBL_LIST_NAME',
65
-  			'link' => true,
66
-	        'default' => true,
67
-  			'related_fields' => array('first_name', 'last_name', 'salutation', 'account_name', 'account_id')), 
68
-		'ACCOUNT_NAME' => array(
69
-			'width' => '25', 
70
-			'label' => 'LBL_LIST_ACCOUNT_NAME', 
71
-			'module' => 'Accounts',
72
-			'id' => 'ACCOUNT_ID',
73
-  			'default' => true,
74
-	        'sortable'=> true,
75
-	        'ACLTag' => 'ACCOUNT',
76
-	        'related_fields' => array('account_id')),
77
-  		'TITLE' => array(
78
-			'width' => '15%', 
79
-			'label' => 'LBL_LIST_TITLE',
80
-	        'default' => true), 
81
-  		'LEAD_SOURCE' => array(
82
-			'width' => '15%', 
83
-			'label' => 'LBL_LEAD_SOURCE',
84
-	        'default' => true), 
85
-		),
86
-	'searchdefs'   => array(
87
-	 	'first_name', 
88
-		'last_name', 
89
-		array('name' => 'account_name', 'type' => 'varchar',),
90
-		'title',
91
-		'lead_source',
92
-		'email',
93
-		array('name' => 'campaign_name', 'displayParams' => array('hideButtons'=>'true', 'size'=>30, 'class'=>'sqsEnabled sqsNoAutofill')),
94
-		array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
95
-	  )
96
-	);
45
+    'moduleMain' => 'Contact',
46
+    'varName' => 'CONTACT',
47
+    'orderBy' => 'contacts.first_name, contacts.last_name',
48
+    'whereClauses' => 
49
+        array('first_name' => 'contacts.first_name', 
50
+                'last_name' => 'contacts.last_name',
51
+                'account_name' => 'accounts.name',
52
+                'account_id' => 'accounts.id'),
53
+    'searchInputs' =>
54
+        array('first_name', 'last_name', 'account_name', 'email'),
55
+    'create' =>
56
+        array('formBase' => 'ContactFormBase.php',
57
+                'formBaseClass' => 'ContactFormBase',
58
+                'getFormBodyParams' => array('','','ContactSave'),
59
+                'createButton' => 'LNK_NEW_CONTACT'
60
+                ),
61
+    'listviewdefs' => array(
62
+        'NAME' => array(
63
+            'width' => '20%', 
64
+            'label' => 'LBL_LIST_NAME',
65
+                'link' => true,
66
+            'default' => true,
67
+                'related_fields' => array('first_name', 'last_name', 'salutation', 'account_name', 'account_id')), 
68
+        'ACCOUNT_NAME' => array(
69
+            'width' => '25', 
70
+            'label' => 'LBL_LIST_ACCOUNT_NAME', 
71
+            'module' => 'Accounts',
72
+            'id' => 'ACCOUNT_ID',
73
+                'default' => true,
74
+            'sortable'=> true,
75
+            'ACLTag' => 'ACCOUNT',
76
+            'related_fields' => array('account_id')),
77
+            'TITLE' => array(
78
+            'width' => '15%', 
79
+            'label' => 'LBL_LIST_TITLE',
80
+            'default' => true), 
81
+            'LEAD_SOURCE' => array(
82
+            'width' => '15%', 
83
+            'label' => 'LBL_LEAD_SOURCE',
84
+            'default' => true), 
85
+        ),
86
+    'searchdefs'   => array(
87
+            'first_name', 
88
+        'last_name', 
89
+        array('name' => 'account_name', 'type' => 'varchar',),
90
+        'title',
91
+        'lead_source',
92
+        'email',
93
+        array('name' => 'campaign_name', 'displayParams' => array('hideButtons'=>'true', 'size'=>30, 'class'=>'sqsEnabled sqsNoAutofill')),
94
+        array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
95
+        )
96
+    );
97 97
 ?>
Please login to merge, or discard this patch.
modules/Contacts/metadata/searchdefs.php 1 patch
Indentation   +115 added lines, -115 removed lines patch added patch discarded remove patch
@@ -38,123 +38,123 @@
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 $searchdefs['Contacts'] = array(
41
-  		  'templateMeta' => array(
42
-  		  					'maxColumns' => '3', 
43
-							'maxColumnsBasic' => '4',
41
+            'templateMeta' => array(
42
+                                'maxColumns' => '3', 
43
+                            'maxColumnsBasic' => '4',
44 44
                             'widths' => array('label' => '10', 'field' => '30'), 
45
-                           ),
46
-		  'layout' => array (
47
-		    'basic_search' => 
48
-		    array (
49
-		      array('name'=>'search_name','label' =>'LBL_NAME', 'type' => 'name'),
50
-		      array (
51
-		        'name' => 'current_user_only',
52
-		        'label' => 'LBL_CURRENT_USER_FILTER',
53
-		        'type' => 'bool',
54
-		      ),
45
+                            ),
46
+            'layout' => array (
47
+            'basic_search' => 
48
+            array (
49
+                array('name'=>'search_name','label' =>'LBL_NAME', 'type' => 'name'),
50
+                array (
51
+                'name' => 'current_user_only',
52
+                'label' => 'LBL_CURRENT_USER_FILTER',
53
+                'type' => 'bool',
54
+                ),
55 55
                 array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
56
-		    ),
57
-		    'advanced_search' => 
58
-		    array (
59
-		      'first_name' => 
60
-		      array (
61
-		        'name' => 'first_name',
62
-		        'default' => true,
63
-		        'width' => '10%',
64
-		      ),
65
-		      'email' => 
66
-		      array (
67
-		        'name' => 'email',
68
-		        'label' => 'LBL_ANY_EMAIL',
69
-		        'type' => 'name',
70
-		        'default' => true,
71
-		        'width' => '10%',
72
-		      ),
73
-		      'phone' => 
74
-		      array (
75
-		        'name' => 'phone',
76
-		        'label' => 'LBL_ANY_PHONE',
77
-		        'type' => 'name',
78
-		        'default' => true,
79
-		        'width' => '10%',
80
-		      ),
81
-		      'last_name' => 
82
-		      array (
83
-		        'name' => 'last_name',
84
-		        'default' => true,
85
-		        'width' => '10%',
86
-		      ),
87
-		      'address_street' => 
88
-		      array (
89
-		        'name' => 'address_street',
90
-		        'label' => 'LBL_ANY_ADDRESS',
91
-		        'type' => 'name',
92
-		        'default' => true,
93
-		        'width' => '10%',
94
-		      ),
95
-		      'address_city' => 
96
-		      array (
97
-		        'name' => 'address_city',
98
-		        'label' => 'LBL_CITY',
99
-		        'type' => 'name',
100
-		        'default' => true,
101
-		        'width' => '10%',
102
-		      ),
103
-		      'account_name' => 
104
-		      array (
105
-		        'name' => 'account_name',
106
-		        'default' => true,
107
-		        'width' => '10%',
108
-		      ),
109
-		      'address_state' => 
110
-		      array (
111
-		        'name' => 'address_state',
112
-		        'label' => 'LBL_STATE',
113
-		        'type' => 'name',
114
-		        'default' => true,
115
-		        'width' => '10%',
116
-		      ),
117
-		      'address_postalcode' => 
118
-		      array (
119
-		        'name' => 'address_postalcode',
120
-		        'label' => 'LBL_POSTAL_CODE',
121
-		        'type' => 'name',
122
-		        'default' => true,
123
-		        'width' => '10%',
124
-		      ),
125
-		      'assigned_user_id' => 
126
-		      array (
127
-		        'name' => 'assigned_user_id',
128
-		        'type' => 'enum',
129
-		        'label' => 'LBL_ASSIGNED_TO',
130
-		        'function' => 
131
-		        array (
132
-		          'name' => 'get_user_array',
133
-		          'params' => 
134
-		          array (
135
-		            0 => false,
136
-		          ),
137
-		        ),
138
-		        'default' => true,
139
-		        'width' => '10%',
140
-		      ),
141
-		      'primary_address_country' => 
142
-		      array (
143
-		        'name' => 'primary_address_country',
144
-		        'label' => 'LBL_COUNTRY',
145
-		        'type' => 'name',
146
-		        'options' => 'countries_dom',
147
-		        'default' => true,
148
-		        'width' => '10%',
149
-		      ),
150
-		      'lead_source' => 
151
-		      array (
152
-		        'name' => 'lead_source',
153
-		        'default' => true,
154
-		        'width' => '10%',
155
-		      ),
56
+            ),
57
+            'advanced_search' => 
58
+            array (
59
+                'first_name' => 
60
+                array (
61
+                'name' => 'first_name',
62
+                'default' => true,
63
+                'width' => '10%',
64
+                ),
65
+                'email' => 
66
+                array (
67
+                'name' => 'email',
68
+                'label' => 'LBL_ANY_EMAIL',
69
+                'type' => 'name',
70
+                'default' => true,
71
+                'width' => '10%',
72
+                ),
73
+                'phone' => 
74
+                array (
75
+                'name' => 'phone',
76
+                'label' => 'LBL_ANY_PHONE',
77
+                'type' => 'name',
78
+                'default' => true,
79
+                'width' => '10%',
80
+                ),
81
+                'last_name' => 
82
+                array (
83
+                'name' => 'last_name',
84
+                'default' => true,
85
+                'width' => '10%',
86
+                ),
87
+                'address_street' => 
88
+                array (
89
+                'name' => 'address_street',
90
+                'label' => 'LBL_ANY_ADDRESS',
91
+                'type' => 'name',
92
+                'default' => true,
93
+                'width' => '10%',
94
+                ),
95
+                'address_city' => 
96
+                array (
97
+                'name' => 'address_city',
98
+                'label' => 'LBL_CITY',
99
+                'type' => 'name',
100
+                'default' => true,
101
+                'width' => '10%',
102
+                ),
103
+                'account_name' => 
104
+                array (
105
+                'name' => 'account_name',
106
+                'default' => true,
107
+                'width' => '10%',
108
+                ),
109
+                'address_state' => 
110
+                array (
111
+                'name' => 'address_state',
112
+                'label' => 'LBL_STATE',
113
+                'type' => 'name',
114
+                'default' => true,
115
+                'width' => '10%',
116
+                ),
117
+                'address_postalcode' => 
118
+                array (
119
+                'name' => 'address_postalcode',
120
+                'label' => 'LBL_POSTAL_CODE',
121
+                'type' => 'name',
122
+                'default' => true,
123
+                'width' => '10%',
124
+                ),
125
+                'assigned_user_id' => 
126
+                array (
127
+                'name' => 'assigned_user_id',
128
+                'type' => 'enum',
129
+                'label' => 'LBL_ASSIGNED_TO',
130
+                'function' => 
131
+                array (
132
+                    'name' => 'get_user_array',
133
+                    'params' => 
134
+                    array (
135
+                    0 => false,
136
+                    ),
137
+                ),
138
+                'default' => true,
139
+                'width' => '10%',
140
+                ),
141
+                'primary_address_country' => 
142
+                array (
143
+                'name' => 'primary_address_country',
144
+                'label' => 'LBL_COUNTRY',
145
+                'type' => 'name',
146
+                'options' => 'countries_dom',
147
+                'default' => true,
148
+                'width' => '10%',
149
+                ),
150
+                'lead_source' => 
151
+                array (
152
+                'name' => 'lead_source',
153
+                'default' => true,
154
+                'width' => '10%',
155
+                ),
156 156
 		      
157
-		    ),
158
-		  )
157
+            ),
158
+            )
159 159
 );
160 160
 ?>
161 161
\ No newline at end of file
Please login to merge, or discard this patch.
modules/Contacts/metadata/SearchFields.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -40,22 +40,22 @@  discard block
 block discarded – undo
40 40
 global $current_user;
41 41
 $module_name = "Contacts";
42 42
 $searchFields['Contacts'] = 
43
-	array (
44
-		'first_name' => array( 'query_type'=>'default'),
45
-		'last_name'=> array('query_type'=>'default'),
46
-		'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
47
-		'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
48
-		'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
49
-		'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
50
-		'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
51
-		'email'=> array(
52
-			'query_type' => 'default',
53
-			'operator' => 'subquery',
54
-			'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',
55
-			'db_field' => array(
56
-				'id',
57
-			),
58
-		),	
43
+    array (
44
+        'first_name' => array( 'query_type'=>'default'),
45
+        'last_name'=> array('query_type'=>'default'),
46
+        'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
47
+        'account_name'=> array('query_type'=>'default','db_field'=>array('accounts.name')),
48
+        'lead_source'=> array('query_type'=>'default','operator'=>'=', 'options' => 'lead_source_dom', 'template_var' => 'LEAD_SOURCE_OPTIONS'),
49
+        'do_not_call'=> array('query_type'=>'default', 'input_type' => 'checkbox', 'operator'=>'='),
50
+        'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','assistant_phone')),
51
+        'email'=> array(
52
+            'query_type' => 'default',
53
+            'operator' => 'subquery',
54
+            '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',
55
+            'db_field' => array(
56
+                'id',
57
+            ),
58
+        ),	
59 59
         'favorites_only' => array(
60 60
             'query_type'=>'format',
61 61
             'operator' => 'subquery',
@@ -64,23 +64,23 @@  discard block
 block discarded – undo
64 64
 			                        and favorites.parent_type = "'.$module_name.'"
65 65
 			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
66 66
             'db_field'=>array('id')),
67
-		'assistant'=> array('query_type'=>'default'),
68
-		'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
69
-		'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
70
-		'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
71
-		'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
72
-		'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
73
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
74
-		'assigned_user_id'=> array('query_type'=>'default'),
67
+        'assistant'=> array('query_type'=>'default'),
68
+        'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
69
+        'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
70
+        'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
71
+        'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
72
+        'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
73
+        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
74
+        'assigned_user_id'=> array('query_type'=>'default'),
75 75
         'account_id'=> array('query_type'=>'default','db_field'=>array('accounts.id')),
76 76
         'campaign_name'=> array('query_type'=>'default'),
77
-		//Range Search Support 
78
-	    'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
79
-	    'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
80
-	    'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
81
-	    'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
82
-	    'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
77
+        //Range Search Support 
78
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
79
+        'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
80
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
81
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
82
+        'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
83 83
         'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
84
-	    //Range Search Support 			
85
-	);
84
+        //Range Search Support 			
85
+    );
86 86
 ?>
Please login to merge, or discard this patch.