Completed
Push — develop ( 695bbe...affb48 )
by Adam
19:17
created
SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Response.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -470,11 +470,11 @@  discard block
 block discarded – undo
470 470
         }
471 471
     }
472 472
 
473
-   /**
474
-    * Checks that the samlp:Response/saml:Assertion/saml:Conditions element exists and is unique.
475
-    *
476
-    * @return boolean true if the Conditions element exists and is unique
477
-    */
473
+    /**
474
+     * Checks that the samlp:Response/saml:Assertion/saml:Conditions element exists and is unique.
475
+     *
476
+     * @return boolean true if the Conditions element exists and is unique
477
+     */
478 478
     public function checkOneCondition()
479 479
     {
480 480
         $entries = $this->_queryAssertion("/saml:Conditions");
@@ -485,11 +485,11 @@  discard block
 block discarded – undo
485 485
         }
486 486
     }
487 487
 
488
-   /**
489
-    * Checks that the samlp:Response/saml:Assertion/saml:AuthnStatement element exists and is unique.
490
-    *
491
-    * @return boolean true if the AuthnStatement element exists and is unique
492
-    */
488
+    /**
489
+     * Checks that the samlp:Response/saml:Assertion/saml:AuthnStatement element exists and is unique.
490
+     *
491
+     * @return boolean true if the AuthnStatement element exists and is unique
492
+     */
493 493
     public function checkOneAuthnStatement()
494 494
     {
495 495
         $entries = $this->_queryAssertion("/saml:AuthnStatement");
@@ -1075,7 +1075,7 @@  discard block
 block discarded – undo
1075 1075
               !$decrypted->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns') &&
1076 1076
               !$container->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:saml') &&
1077 1077
               !$container->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:saml2')
1078
-              ) {
1078
+                ) {
1079 1079
                 if (strpos($encryptedAssertion->tagName, 'saml2:') !== false) {
1080 1080
                     $ns = 'xmlns:saml2';
1081 1081
                 } else if (strpos($encryptedAssertion->tagName, 'saml:') !== false) {
Please login to merge, or discard this patch.
SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/LogoutResponse.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
 class OneLogin_Saml2_LogoutResponse
8 8
 {
9 9
     /**
10
-    * Contains the ID of the Logout Response
11
-    * @var string
12
-    */
10
+     * Contains the ID of the Logout Response
11
+     * @var string
12
+     */
13 13
     public $id;
14 14
 
15 15
     /**
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
     public $document;
32 32
 
33 33
     /**
34
-    * After execute a validation process, if it fails, this var contains the cause
35
-    * @var string
36
-    */
34
+     * After execute a validation process, if it fails, this var contains the cause
35
+     * @var string
36
+     */
37 37
     private $_error;
38 38
 
39 39
     /**
@@ -270,9 +270,9 @@  discard block
 block discarded – undo
270 270
         return $this->_error;
271 271
     }
272 272
 
273
-   /**
274
-    * @return the ID of the Response
275
-    */
273
+    /**
274
+     * @return the ID of the Response
275
+     */
276 276
     public function getId()
277 277
     {
278 278
         return $this->id;
Please login to merge, or discard this patch.
SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Settings.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -773,20 +773,20 @@
 block discarded – undo
773 773
     }
774 774
 
775 775
     /**
776
-    * Should SAML requests be compressed?
777
-    *
778
-    * @return bool Yes/No as True/False
779
-    */
776
+     * Should SAML requests be compressed?
777
+     *
778
+     * @return bool Yes/No as True/False
779
+     */
780 780
     public function shouldCompressRequests()
781 781
     {
782 782
         return $this->_compress['requests'];
783 783
     }
784 784
 
785 785
     /**
786
-    * Should SAML responses be compressed?
787
-    *
788
-    * @return bool Yes/No as True/False
789
-    */
786
+     * Should SAML responses be compressed?
787
+     *
788
+     * @return bool Yes/No as True/False
789
+     */
790 790
     public function shouldCompressResponses()
791 791
     {
792 792
         return $this->_compress['responses'];
Please login to merge, or discard this patch.
modules/Campaigns/WebToLeadCapture.php 1 patch
Indentation   +109 added lines, -109 removed lines patch added patch discarded remove patch
@@ -55,20 +55,20 @@  discard block
 block discarded – undo
55 55
  * To make your changes upgrade safe create a file called leadCapture_override.php and place the changes there
56 56
  */
57 57
 $users = array(
58
-	'PUT A RANDOM KEY FROM THE WEBSITE HERE' => array('name'=>'PUT THE USER_NAME HERE', 'pass'=>'PUT THE USER_HASH FOR THE RESPECTIVE USER HERE'),
58
+    'PUT A RANDOM KEY FROM THE WEBSITE HERE' => array('name'=>'PUT THE USER_NAME HERE', 'pass'=>'PUT THE USER_HASH FOR THE RESPECTIVE USER HERE'),
59 59
 );
60 60
 
61 61
 if (isset($_POST['campaign_id']) && !empty($_POST['campaign_id'])) {
62
-	    //adding the client ip address
63
-	    $_POST['client_id_address'] = query_client_ip();
64
-		$campaign_id=$_POST['campaign_id'];
65
-		$campaign = new Campaign();
62
+        //adding the client ip address
63
+        $_POST['client_id_address'] = query_client_ip();
64
+        $campaign_id=$_POST['campaign_id'];
65
+        $campaign = new Campaign();
66 66
         $campaign_id = $campaign->db->quote($_POST['campaign_id']);
67 67
         if(!isValidId($campaign_id)) {
68
-			throw new RuntimeException('Invalid ID requested in Lead Capture');
69
-    	}
70
-		$camp_query  = "select name,id from campaigns where id='$campaign_id'";
71
-		$camp_query .= " and deleted=0";
68
+            throw new RuntimeException('Invalid ID requested in Lead Capture');
69
+        }
70
+        $camp_query  = "select name,id from campaigns where id='$campaign_id'";
71
+        $camp_query .= " and deleted=0";
72 72
         $camp_result=$campaign->db->query($camp_query);
73 73
         $camp_data = $campaign->db->fetchByAssoc($camp_result);
74 74
         // Bug 41292 - have to select marketing_id for new lead
@@ -82,20 +82,20 @@  discard block
 block discarded – undo
82 82
         $marketing_result = $db->limitQuery($marketing_query, 0, 1, true);
83 83
         $marketing_data = $db->fetchByAssoc($marketing_result);
84 84
         // .Bug 41292
85
-		if (isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id'])) {
86
-			$current_user = new User();
87
-			$current_user->retrieve($_REQUEST['assigned_user_id']);
88
-		} 
85
+        if (isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id'])) {
86
+            $current_user = new User();
87
+            $current_user->retrieve($_REQUEST['assigned_user_id']);
88
+        } 
89 89
 
90
-	    if(isset($camp_data) && $camp_data != null ){
91
-			$leadForm = new LeadFormBase();
90
+        if(isset($camp_data) && $camp_data != null ){
91
+            $leadForm = new LeadFormBase();
92 92
             $lead = new Lead();
93
-			$prefix = '';
94
-			if(!empty($_POST['prefix'])){
95
-				$prefix = $_POST['prefix'];
96
-			}
93
+            $prefix = '';
94
+            if(!empty($_POST['prefix'])){
95
+                $prefix = $_POST['prefix'];
96
+            }
97 97
 
98
-			if(empty($lead->id)) {
98
+            if(empty($lead->id)) {
99 99
                 $lead->id = create_guid();
100 100
                 $lead->new_with_id = true;
101 101
             }
@@ -118,47 +118,47 @@  discard block
 block discarded – undo
118 118
             // checkRequired needs a major overhaul before it works for web to lead forms.
119 119
             $lead = $leadForm->handleSave($prefix, false, false, false, $lead);
120 120
             
121
-			if(!empty($lead)){
121
+            if(!empty($lead)){
122 122
 				
123
-	            //create campaign log
124
-	            $camplog = new CampaignLog();
125
-	            $camplog->campaign_id  = $campaign_id;
126
-	            $camplog->related_id   = $lead->id;
127
-	            $camplog->related_type = $lead->module_dir;
128
-	            $camplog->activity_type = "lead";
129
-	            $camplog->target_type = $lead->module_dir;
130
-	            $campaign_log->activity_date=$timedate->now();
131
-	            $camplog->target_id    = $lead->id;
123
+                //create campaign log
124
+                $camplog = new CampaignLog();
125
+                $camplog->campaign_id  = $campaign_id;
126
+                $camplog->related_id   = $lead->id;
127
+                $camplog->related_type = $lead->module_dir;
128
+                $camplog->activity_type = "lead";
129
+                $camplog->target_type = $lead->module_dir;
130
+                $campaign_log->activity_date=$timedate->now();
131
+                $camplog->target_id    = $lead->id;
132 132
                 if(isset($marketing_data['id']))
133 133
                 {
134 134
                     $camplog->marketing_id = $marketing_data['id'];
135 135
                 }
136
-	            $camplog->save();
136
+                $camplog->save();
137 137
 
138
-		        //link campaignlog and lead
138
+                //link campaignlog and lead
139 139
 
140
-		        if (isset($_POST['email1']) && $_POST['email1'] != null)
140
+                if (isset($_POST['email1']) && $_POST['email1'] != null)
141 141
                 {
142 142
                     $lead->email1 = $_POST['email1'];
143
-		        } 
143
+                } 
144 144
                 //in case there are old forms used webtolead_email1
145 145
                 elseif (isset($_POST['webtolead_email1']) && $_POST['webtolead_email1'] != null)
146 146
                 {
147 147
                     $lead->email1 = $_POST['webtolead_email1'];
148 148
                 }
149 149
                 
150
-		        if (isset($_POST['email2']) && $_POST['email2'] != null)
150
+                if (isset($_POST['email2']) && $_POST['email2'] != null)
151 151
                 {
152 152
                     $lead->email2 = $_POST['email2'];
153
-		        } 
153
+                } 
154 154
                 //in case there are old forms used webtolead_email2
155 155
                 elseif (isset($_POST['webtolead_email2']) && $_POST['webtolead_email2'] != null)
156 156
                 {
157 157
                     $lead->email2 = $_POST['webtolead_email2'];
158 158
                 }
159 159
                 
160
-		        $lead->load_relationship('campaigns');
161
-		        $lead->campaigns->add($camplog->id);
160
+                $lead->load_relationship('campaigns');
161
+                $lead->campaigns->add($camplog->id);
162 162
                 if(!empty($GLOBALS['check_notify'])) {
163 163
                     $lead->save($GLOBALS['check_notify']);
164 164
                 }
@@ -180,91 +180,91 @@  discard block
 block discarded – undo
180 180
                     
181 181
                 }
182 182
             }              
183
-			if(isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])){
184
-			    // Get the redirect url, and make sure the query string is not too long
185
-		        $redirect_url = $_POST['redirect_url'];
186
-		        $query_string = '';
187
-				$first_char = '&';
188
-				if(strpos($redirect_url, '?') === FALSE){
189
-					$first_char = '?';
190
-				}
191
-				$first_iteration = true;
192
-				$get_and_post = array_merge($_GET, $_POST);
193
-				foreach($get_and_post as $param => $value) {
183
+            if(isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])){
184
+                // Get the redirect url, and make sure the query string is not too long
185
+                $redirect_url = $_POST['redirect_url'];
186
+                $query_string = '';
187
+                $first_char = '&';
188
+                if(strpos($redirect_url, '?') === FALSE){
189
+                    $first_char = '?';
190
+                }
191
+                $first_iteration = true;
192
+                $get_and_post = array_merge($_GET, $_POST);
193
+                foreach($get_and_post as $param => $value) {
194 194
 
195
-					if($param == 'redirect_url' && $param == 'submit')
196
-						continue;
195
+                    if($param == 'redirect_url' && $param == 'submit')
196
+                        continue;
197 197
 					
198
-					if($first_iteration){
199
-						$first_iteration = false;
200
-						$query_string .= $first_char;
201
-					}
202
-					else{
203
-						$query_string .= "&";
204
-					}
205
-					$query_string .= "{$param}=".urlencode($value);
206
-				}
207
-				if(empty($lead)) {
208
-					if($first_iteration){
209
-						$query_string .= $first_char;
210
-					}
211
-					else{
212
-						$query_string .= "&";
213
-					}
214
-					$query_string .= "error=1";
215
-				}
198
+                    if($first_iteration){
199
+                        $first_iteration = false;
200
+                        $query_string .= $first_char;
201
+                    }
202
+                    else{
203
+                        $query_string .= "&";
204
+                    }
205
+                    $query_string .= "{$param}=".urlencode($value);
206
+                }
207
+                if(empty($lead)) {
208
+                    if($first_iteration){
209
+                        $query_string .= $first_char;
210
+                    }
211
+                    else{
212
+                        $query_string .= "&";
213
+                    }
214
+                    $query_string .= "error=1";
215
+                }
216 216
 				
217
-				$redirect_url = $redirect_url.$query_string;
217
+                $redirect_url = $redirect_url.$query_string;
218 218
 
219 219
 
220
-				// Check if the headers have been sent, or if the redirect url is greater than 2083 characters (IE max URL length)
221
-				//   and use a javascript form submission if that is the case.
222
-			    if(headers_sent() || strlen($redirect_url) > 2083){
223
-    				echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
224
-    				echo '<form name="redirect" action="' .$_POST['redirect_url']. '" method="GET">';
220
+                // Check if the headers have been sent, or if the redirect url is greater than 2083 characters (IE max URL length)
221
+                //   and use a javascript form submission if that is the case.
222
+                if(headers_sent() || strlen($redirect_url) > 2083){
223
+                    echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
224
+                    echo '<form name="redirect" action="' .$_POST['redirect_url']. '" method="GET">';
225 225
     
226
-    				foreach($_POST as $param => $value) {
227
-    					if($param != 'redirect_url' ||$param != 'submit') {
228
-    						echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
229
-    					}
230
-    				}
231
-    				if(empty($lead)) {
232
-    					echo '<input type="hidden" name="error" value="1">';
233
-    				}
234
-    				echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
235
-    				echo '</body></html>';
236
-    			}
237
-				else{
238
-    				$header_URL = "Location: {$redirect_url}";
226
+                    foreach($_POST as $param => $value) {
227
+                        if($param != 'redirect_url' ||$param != 'submit') {
228
+                            echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
229
+                        }
230
+                    }
231
+                    if(empty($lead)) {
232
+                        echo '<input type="hidden" name="error" value="1">';
233
+                    }
234
+                    echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
235
+                    echo '</body></html>';
236
+                }
237
+                else{
238
+                    $header_URL = "Location: {$redirect_url}";
239 239
 
240
-					SugarApplication::headerRedirect($header_URL);
240
+                    SugarApplication::headerRedirect($header_URL);
241 241
 
242
-    				die();
243
-			    }
244
-			}
245
-			else{
246
-				echo $mod_strings['LBL_THANKS_FOR_SUBMITTING'];
247
-			}
248
-			sugar_cleanup();
249
-			// die to keep code from running into redirect case below
250
-			die();
251
-	    }
252
-	   else{
253
-	  	  echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
254
-	  }
242
+                    die();
243
+                }
244
+            }
245
+            else{
246
+                echo $mod_strings['LBL_THANKS_FOR_SUBMITTING'];
247
+            }
248
+            sugar_cleanup();
249
+            // die to keep code from running into redirect case below
250
+            die();
251
+        }
252
+        else{
253
+            echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
254
+        }
255 255
 }
256 256
 
257 257
 if (!empty($_POST['redirect'])) {
258 258
     if(headers_sent()){
259
-    	echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
260
-    	echo '<form name="redirect" action="' .$_POST['redirect']. '" method="GET">';
261
-    	echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
262
-    	echo '</body></html>';
259
+        echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
260
+        echo '<form name="redirect" action="' .$_POST['redirect']. '" method="GET">';
261
+        echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
262
+        echo '</body></html>';
263 263
     }
264 264
     else{
265
-    	$header_URL = "Location: {$_POST['redirect']}";
266
-		SugarApplication::headerRedirect($header_URL);
267
-    	die();
265
+        $header_URL = "Location: {$_POST['redirect']}";
266
+        SugarApplication::headerRedirect($header_URL);
267
+        die();
268 268
     }
269 269
 }
270 270
 
Please login to merge, or discard this patch.
include/ListView/ListViewSubPanel.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -546,10 +546,10 @@
 block discarded – undo
546 546
             global $app_strings;
547 547
 
548 548
             if(!isset($current_offset) || empty($current_offset))
549
-	    {
550
-  		$current_offset=0;
551
-	    }
552
-	    $start_record = $current_offset + 1;
549
+        {
550
+            $current_offset=0;
551
+        }
552
+        $start_record = $current_offset + 1;
553 553
 
554 554
             if (!is_numeric($col_count)) {
555 555
                 $col_count = 20;
Please login to merge, or discard this patch.
custom/modules/Accounts/metadata/listviewdefs.php 1 patch
Indentation   +87 added lines, -87 removed lines patch added patch discarded remove patch
@@ -1,186 +1,186 @@
 block discarded – undo
1 1
 <?php
2 2
 $listViewDefs ['Accounts'] = 
3 3
 array (
4
-  'NAME' => 
5
-  array (
4
+    'NAME' => 
5
+    array (
6 6
     'width' => '20%',
7 7
     'label' => 'LBL_LIST_ACCOUNT_NAME',
8 8
     'link' => true,
9 9
     'default' => true,
10
-  ),
11
-  'BILLING_ADDRESS_COUNTRY' => 
12
-  array (
10
+    ),
11
+    'BILLING_ADDRESS_COUNTRY' => 
12
+    array (
13 13
     'width' => '10%',
14 14
     'label' => 'LBL_BILLING_ADDRESS_COUNTRY',
15 15
     'default' => true,
16
-  ),
17
-  'BILLING_ADDRESS_CITY' => 
18
-  array (
16
+    ),
17
+    'BILLING_ADDRESS_CITY' => 
18
+    array (
19 19
     'width' => '10%',
20 20
     'label' => 'LBL_LIST_CITY',
21 21
     'default' => true,
22
-  ),
23
-  'PHONE_OFFICE' => 
24
-  array (
22
+    ),
23
+    'PHONE_OFFICE' => 
24
+    array (
25 25
     'width' => '10%',
26 26
     'label' => 'LBL_LIST_PHONE',
27 27
     'default' => true,
28
-  ),
29
-  'ASSIGNED_USER_NAME' => 
30
-  array (
28
+    ),
29
+    'ASSIGNED_USER_NAME' => 
30
+    array (
31 31
     'width' => '10%',
32 32
     'label' => 'LBL_LIST_ASSIGNED_USER',
33 33
     'module' => 'Employees',
34 34
     'id' => 'ASSIGNED_USER_ID',
35 35
     'default' => true,
36
-  ),
37
-  'EMAIL1' => 
38
-  array (
36
+    ),
37
+    'EMAIL1' => 
38
+    array (
39 39
     'width' => '15%',
40 40
     'label' => 'LBL_EMAIL_ADDRESS',
41 41
     'sortable' => false,
42 42
     'link' => true,
43 43
     'customCode' => '{$EMAIL1_LINK}{$EMAIL1}</a>',
44 44
     'default' => true,
45
-  ),
46
-  'DATE_ENTERED' => 
47
-  array (
45
+    ),
46
+    'DATE_ENTERED' => 
47
+    array (
48 48
     'width' => '5%',
49 49
     'label' => 'LBL_DATE_ENTERED',
50 50
     'default' => true,
51
-  ),
52
-  'ACCOUNT_TYPE' => 
53
-  array (
51
+    ),
52
+    'ACCOUNT_TYPE' => 
53
+    array (
54 54
     'width' => '10%',
55 55
     'label' => 'LBL_TYPE',
56 56
     'default' => false,
57
-  ),
58
-  'INDUSTRY' => 
59
-  array (
57
+    ),
58
+    'INDUSTRY' => 
59
+    array (
60 60
     'width' => '10%',
61 61
     'label' => 'LBL_INDUSTRY',
62 62
     'default' => false,
63
-  ),
64
-  'ANNUAL_REVENUE' => 
65
-  array (
63
+    ),
64
+    'ANNUAL_REVENUE' => 
65
+    array (
66 66
     'width' => '10%',
67 67
     'label' => 'LBL_ANNUAL_REVENUE',
68 68
     'default' => false,
69
-  ),
70
-  'PHONE_FAX' => 
71
-  array (
69
+    ),
70
+    'PHONE_FAX' => 
71
+    array (
72 72
     'width' => '10%',
73 73
     'label' => 'LBL_PHONE_FAX',
74 74
     'default' => false,
75
-  ),
76
-  'BILLING_ADDRESS_STREET' => 
77
-  array (
75
+    ),
76
+    'BILLING_ADDRESS_STREET' => 
77
+    array (
78 78
     'width' => '15%',
79 79
     'label' => 'LBL_BILLING_ADDRESS_STREET',
80 80
     'default' => false,
81
-  ),
82
-  'BILLING_ADDRESS_STATE' => 
83
-  array (
81
+    ),
82
+    'BILLING_ADDRESS_STATE' => 
83
+    array (
84 84
     'width' => '7%',
85 85
     'label' => 'LBL_BILLING_ADDRESS_STATE',
86 86
     'default' => false,
87
-  ),
88
-  'BILLING_ADDRESS_POSTALCODE' => 
89
-  array (
87
+    ),
88
+    'BILLING_ADDRESS_POSTALCODE' => 
89
+    array (
90 90
     'width' => '10%',
91 91
     'label' => 'LBL_BILLING_ADDRESS_POSTALCODE',
92 92
     'default' => false,
93
-  ),
94
-  'SHIPPING_ADDRESS_STREET' => 
95
-  array (
93
+    ),
94
+    'SHIPPING_ADDRESS_STREET' => 
95
+    array (
96 96
     'width' => '15%',
97 97
     'label' => 'LBL_SHIPPING_ADDRESS_STREET',
98 98
     'default' => false,
99
-  ),
100
-  'SHIPPING_ADDRESS_CITY' => 
101
-  array (
99
+    ),
100
+    'SHIPPING_ADDRESS_CITY' => 
101
+    array (
102 102
     'width' => '10%',
103 103
     'label' => 'LBL_SHIPPING_ADDRESS_CITY',
104 104
     'default' => false,
105
-  ),
106
-  'SHIPPING_ADDRESS_STATE' => 
107
-  array (
105
+    ),
106
+    'SHIPPING_ADDRESS_STATE' => 
107
+    array (
108 108
     'width' => '7%',
109 109
     'label' => 'LBL_SHIPPING_ADDRESS_STATE',
110 110
     'default' => false,
111
-  ),
112
-  'SHIPPING_ADDRESS_POSTALCODE' => 
113
-  array (
111
+    ),
112
+    'SHIPPING_ADDRESS_POSTALCODE' => 
113
+    array (
114 114
     'width' => '10%',
115 115
     'label' => 'LBL_SHIPPING_ADDRESS_POSTALCODE',
116 116
     'default' => false,
117
-  ),
118
-  'SHIPPING_ADDRESS_COUNTRY' => 
119
-  array (
117
+    ),
118
+    'SHIPPING_ADDRESS_COUNTRY' => 
119
+    array (
120 120
     'width' => '10%',
121 121
     'label' => 'LBL_SHIPPING_ADDRESS_COUNTRY',
122 122
     'default' => false,
123
-  ),
124
-  'RATING' => 
125
-  array (
123
+    ),
124
+    'RATING' => 
125
+    array (
126 126
     'width' => '10%',
127 127
     'label' => 'LBL_RATING',
128 128
     'default' => false,
129
-  ),
130
-  'PHONE_ALTERNATE' => 
131
-  array (
129
+    ),
130
+    'PHONE_ALTERNATE' => 
131
+    array (
132 132
     'width' => '10%',
133 133
     'label' => 'LBL_OTHER_PHONE',
134 134
     'default' => false,
135
-  ),
136
-  'WEBSITE' => 
137
-  array (
135
+    ),
136
+    'WEBSITE' => 
137
+    array (
138 138
     'width' => '10%',
139 139
     'label' => 'LBL_WEBSITE',
140 140
     'default' => false,
141
-  ),
142
-  'OWNERSHIP' => 
143
-  array (
141
+    ),
142
+    'OWNERSHIP' => 
143
+    array (
144 144
     'width' => '10%',
145 145
     'label' => 'LBL_OWNERSHIP',
146 146
     'default' => false,
147
-  ),
148
-  'EMPLOYEES' => 
149
-  array (
147
+    ),
148
+    'EMPLOYEES' => 
149
+    array (
150 150
     'width' => '10%',
151 151
     'label' => 'LBL_EMPLOYEES',
152 152
     'default' => false,
153
-  ),
154
-  'SIC_CODE' => 
155
-  array (
153
+    ),
154
+    'SIC_CODE' => 
155
+    array (
156 156
     'width' => '10%',
157 157
     'label' => 'LBL_SIC_CODE',
158 158
     'default' => false,
159
-  ),
160
-  'TICKER_SYMBOL' => 
161
-  array (
159
+    ),
160
+    'TICKER_SYMBOL' => 
161
+    array (
162 162
     'width' => '10%',
163 163
     'label' => 'LBL_TICKER_SYMBOL',
164 164
     'default' => false,
165
-  ),
166
-  'DATE_MODIFIED' => 
167
-  array (
165
+    ),
166
+    'DATE_MODIFIED' => 
167
+    array (
168 168
     'width' => '5%',
169 169
     'label' => 'LBL_DATE_MODIFIED',
170 170
     'default' => false,
171
-  ),
172
-  'CREATED_BY_NAME' => 
173
-  array (
171
+    ),
172
+    'CREATED_BY_NAME' => 
173
+    array (
174 174
     'width' => '10%',
175 175
     'label' => 'LBL_CREATED',
176 176
     'default' => false,
177
-  ),
178
-  'MODIFIED_BY_NAME' => 
179
-  array (
177
+    ),
178
+    'MODIFIED_BY_NAME' => 
179
+    array (
180 180
     'width' => '10%',
181 181
     'label' => 'LBL_MODIFIED',
182 182
     'default' => false,
183
-  ),
183
+    ),
184 184
 );
185 185
 ;
186 186
 ?>
Please login to merge, or discard this patch.