Completed
Push — develop ( 695bbe...affb48 )
by Adam
19:17
created
modules/Campaigns/WebToLeadCapture.php 2 patches
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.
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 
48 48
 $mod_strings = return_module_language($sugar_config['default_language'], 'Leads');
49 49
 
50
-$app_list_strings['record_type_module'] = array('Contact'=>'Contacts', 'Account'=>'Accounts', 'Opportunity'=>'Opportunities', 'Case'=>'Cases', 'Note'=>'Notes', 'Call'=>'Calls', 'Email'=>'Emails', 'Meeting'=>'Meetings', 'Task'=>'Tasks', 'Lead'=>'Leads','Bug'=>'Bugs',
50
+$app_list_strings['record_type_module'] = array('Contact'=>'Contacts', 'Account'=>'Accounts', 'Opportunity'=>'Opportunities', 'Case'=>'Cases', 'Note'=>'Notes', 'Call'=>'Calls', 'Email'=>'Emails', 'Meeting'=>'Meetings', 'Task'=>'Tasks', 'Lead'=>'Leads', 'Bug'=>'Bugs',
51 51
 
52 52
 );
53 53
 
@@ -61,22 +61,22 @@  discard block
 block discarded – undo
61 61
 if (isset($_POST['campaign_id']) && !empty($_POST['campaign_id'])) {
62 62
 	    //adding the client ip address
63 63
 	    $_POST['client_id_address'] = query_client_ip();
64
-		$campaign_id=$_POST['campaign_id'];
64
+		$campaign_id = $_POST['campaign_id'];
65 65
 		$campaign = new Campaign();
66 66
         $campaign_id = $campaign->db->quote($_POST['campaign_id']);
67
-        if(!isValidId($campaign_id)) {
67
+        if (!isValidId($campaign_id)) {
68 68
 			throw new RuntimeException('Invalid ID requested in Lead Capture');
69 69
     	}
70 70
 		$camp_query  = "select name,id from campaigns where id='$campaign_id'";
71 71
 		$camp_query .= " and deleted=0";
72
-        $camp_result=$campaign->db->query($camp_query);
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
75 75
         $db = DBManagerFactory::getInstance();
76 76
         $marketing = new EmailMarketing();
77 77
         $marketing_query = $marketing->create_new_list_query(
78 78
                 'date_start desc, date_modified desc',
79
-                "campaign_id = '{$campaign_id}' and status = 'active' and date_start < " . $db->convert('', 'today'),
79
+                "campaign_id = '{$campaign_id}' and status = 'active' and date_start < ".$db->convert('', 'today'),
80 80
                 array('id')
81 81
         );
82 82
         $marketing_result = $db->limitQuery($marketing_query, 0, 1, true);
@@ -87,22 +87,22 @@  discard block
 block discarded – undo
87 87
 			$current_user->retrieve($_REQUEST['assigned_user_id']);
88 88
 		} 
89 89
 
90
-	    if(isset($camp_data) && $camp_data != null ){
90
+	    if (isset($camp_data) && $camp_data != null) {
91 91
 			$leadForm = new LeadFormBase();
92 92
             $lead = new Lead();
93 93
 			$prefix = '';
94
-			if(!empty($_POST['prefix'])){
94
+			if (!empty($_POST['prefix'])) {
95 95
 				$prefix = $_POST['prefix'];
96 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
             }
102 102
             $GLOBALS['check_notify'] = true;
103 103
 
104 104
             //bug: 47574 - make sure, that webtolead_email1 field has same required attribute as email1 field
105
-            if(isset($lead->required_fields['email1'])){
105
+            if (isset($lead->required_fields['email1'])) {
106 106
                 $lead->required_fields['webtolead_email1'] = $lead->required_fields['email1'];
107 107
             }
108 108
             
@@ -118,7 +118,7 @@  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 123
 	            //create campaign log
124 124
 	            $camplog = new CampaignLog();
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 	            $camplog->related_type = $lead->module_dir;
128 128
 	            $camplog->activity_type = "lead";
129 129
 	            $camplog->target_type = $lead->module_dir;
130
-	            $campaign_log->activity_date=$timedate->now();
131
-	            $camplog->target_id    = $lead->id;
132
-                if(isset($marketing_data['id']))
130
+	            $campaign_log->activity_date = $timedate->now();
131
+	            $camplog->target_id = $lead->id;
132
+                if (isset($marketing_data['id']))
133 133
                 {
134 134
                     $camplog->marketing_id = $marketing_data['id'];
135 135
                 }
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
                 
160 160
 		        $lead->load_relationship('campaigns');
161 161
 		        $lead->campaigns->add($camplog->id);
162
-                if(!empty($GLOBALS['check_notify'])) {
162
+                if (!empty($GLOBALS['check_notify'])) {
163 163
                     $lead->save($GLOBALS['check_notify']);
164 164
                 }
165 165
                 else {
@@ -168,47 +168,47 @@  discard block
 block discarded – undo
168 168
             }
169 169
 
170 170
             //in case there are forms out there still using email_opt_out
171
-            if(isset($_POST['webtolead_email_opt_out']) || isset($_POST['email_opt_out'])){
171
+            if (isset($_POST['webtolead_email_opt_out']) || isset($_POST['email_opt_out'])) {
172 172
                     
173
-                if(isset ($lead->email1) && !empty($lead->email1)){
173
+                if (isset ($lead->email1) && !empty($lead->email1)) {
174 174
                     $sea = new SugarEmailAddress();
175
-                    $sea->AddUpdateEmailAddress($lead->email1,0,1);
175
+                    $sea->AddUpdateEmailAddress($lead->email1, 0, 1);
176 176
                 }   
177
-                if(isset ($lead->email2) && !empty($lead->email2)){
177
+                if (isset ($lead->email2) && !empty($lead->email2)) {
178 178
                     $sea = new SugarEmailAddress();
179
-                    $sea->AddUpdateEmailAddress($lead->email2,0,1);
179
+                    $sea->AddUpdateEmailAddress($lead->email2, 0, 1);
180 180
                     
181 181
                 }
182 182
             }              
183
-			if(isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])){
183
+			if (isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])) {
184 184
 			    // Get the redirect url, and make sure the query string is not too long
185 185
 		        $redirect_url = $_POST['redirect_url'];
186 186
 		        $query_string = '';
187 187
 				$first_char = '&';
188
-				if(strpos($redirect_url, '?') === FALSE){
188
+				if (strpos($redirect_url, '?') === FALSE) {
189 189
 					$first_char = '?';
190 190
 				}
191 191
 				$first_iteration = true;
192 192
 				$get_and_post = array_merge($_GET, $_POST);
193
-				foreach($get_and_post as $param => $value) {
193
+				foreach ($get_and_post as $param => $value) {
194 194
 
195
-					if($param == 'redirect_url' && $param == 'submit')
195
+					if ($param == 'redirect_url' && $param == 'submit')
196 196
 						continue;
197 197
 					
198
-					if($first_iteration){
198
+					if ($first_iteration) {
199 199
 						$first_iteration = false;
200 200
 						$query_string .= $first_char;
201 201
 					}
202
-					else{
202
+					else {
203 203
 						$query_string .= "&";
204 204
 					}
205 205
 					$query_string .= "{$param}=".urlencode($value);
206 206
 				}
207
-				if(empty($lead)) {
208
-					if($first_iteration){
207
+				if (empty($lead)) {
208
+					if ($first_iteration) {
209 209
 						$query_string .= $first_char;
210 210
 					}
211
-					else{
211
+					else {
212 212
 						$query_string .= "&";
213 213
 					}
214 214
 					$query_string .= "error=1";
@@ -219,22 +219,22 @@  discard block
 block discarded – undo
219 219
 
220 220
 				// Check if the headers have been sent, or if the redirect url is greater than 2083 characters (IE max URL length)
221 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">';
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') {
226
+    				foreach ($_POST as $param => $value) {
227
+    					if ($param != 'redirect_url' || $param != 'submit') {
228 228
     						echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
229 229
     					}
230 230
     				}
231
-    				if(empty($lead)) {
231
+    				if (empty($lead)) {
232 232
     					echo '<input type="hidden" name="error" value="1">';
233 233
     				}
234 234
     				echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
235 235
     				echo '</body></html>';
236 236
     			}
237
-				else{
237
+				else {
238 238
     				$header_URL = "Location: {$redirect_url}";
239 239
 
240 240
 					SugarApplication::headerRedirect($header_URL);
@@ -242,26 +242,26 @@  discard block
 block discarded – undo
242 242
     				die();
243 243
 			    }
244 244
 			}
245
-			else{
245
+			else {
246 246
 				echo $mod_strings['LBL_THANKS_FOR_SUBMITTING'];
247 247
 			}
248 248
 			sugar_cleanup();
249 249
 			// die to keep code from running into redirect case below
250 250
 			die();
251 251
 	    }
252
-	   else{
252
+	   else {
253 253
 	  	  echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
254 254
 	  }
255 255
 }
256 256
 
257 257
 if (!empty($_POST['redirect'])) {
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">';
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 261
     	echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
262 262
     	echo '</body></html>';
263 263
     }
264
-    else{
264
+    else {
265 265
     	$header_URL = "Location: {$_POST['redirect']}";
266 266
 		SugarApplication::headerRedirect($header_URL);
267 267
     	die();
Please login to merge, or discard this patch.
modules/Campaigns/WebToPersonCapture.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
     $_POST['client_id_address'] = query_client_ip();
61 61
     $campaign = new Campaign();
62 62
     $campaign_id = $campaign->db->quote($_POST['campaign_id']);
63
-    if(!isValidId($campaign_id)) {
63
+    if (!isValidId($campaign_id)) {
64 64
         throw new RuntimeException('Invalid ID requested in Person Capture');
65 65
     }
66 66
     $camp_query = "select name,id from campaigns where id='$campaign_id'";
Please login to merge, or discard this patch.
modules/AOS_PDF_Templates/templateParser.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -59,33 +59,33 @@  discard block
 block discarded – undo
59 59
             if (isset($field_def['name']) && $field_def['name'] != '') {
60 60
                 $fieldName = $field_def['name'];
61 61
                 if ($field_def['type'] == 'currency') {
62
-                    $repl_arr[$key . "_" . $fieldName] = currency_format_number($focus->$fieldName, $params = array('currency_symbol' => false));
62
+                    $repl_arr[$key."_".$fieldName] = currency_format_number($focus->$fieldName, $params = array('currency_symbol' => false));
63 63
                 } else if (($field_def['type'] == 'radioenum' || $field_def['type'] == 'enum' || $field_def['type'] == 'dynamicenum') && isset($field_def['options'])) {
64
-                    $repl_arr[$key . "_" . $fieldName] = translate($field_def['options'], $focus->module_dir, $focus->$fieldName);
64
+                    $repl_arr[$key."_".$fieldName] = translate($field_def['options'], $focus->module_dir, $focus->$fieldName);
65 65
                 } else if ($field_def['type'] == 'multienum' && isset($field_def['options'])) {
66 66
                     $mVals = unencodeMultienum($focus->$fieldName);
67 67
                     $translatedVals = array();
68
-                    foreach($mVals as $mVal){
68
+                    foreach ($mVals as $mVal) {
69 69
                         $translatedVals[] = translate($field_def['options'], $focus->module_dir, $mVal);
70 70
                     }
71
-                    $repl_arr[$key . "_" . $fieldName] = implode(", ", $translatedVals);
71
+                    $repl_arr[$key."_".$fieldName] = implode(", ", $translatedVals);
72 72
                 } //Fix for Windows Server as it needed to be converted to a string.
73 73
                 else if ($field_def['type'] == 'int') {
74
-                    $repl_arr[$key . "_" . $fieldName] = strval($focus->$fieldName);
74
+                    $repl_arr[$key."_".$fieldName] = strval($focus->$fieldName);
75 75
                 } else if ($field_def['type'] == 'image') {
76
-                    $secureLink = $sugar_config['site_url'] . '/' . "public/". $focus->id .  '_' . $fieldName;
77
-                    $file_location = $sugar_config['upload_dir'] . '/'  . $focus->id .  '_' . $fieldName;
76
+                    $secureLink = $sugar_config['site_url'].'/'."public/".$focus->id.'_'.$fieldName;
77
+                    $file_location = $sugar_config['upload_dir'].'/'.$focus->id.'_'.$fieldName;
78 78
                     // create a copy with correct extension by mime type
79
-                    if(!file_exists('public')) {
79
+                    if (!file_exists('public')) {
80 80
                         sugar_mkdir('public', 0777);
81 81
                     }
82
-                    if(!copy($file_location, "public/{$focus->id}".  '_' . "$fieldName")) {
83
-                        $secureLink = $sugar_config['site_url'] . '/'. $file_location;
82
+                    if (!copy($file_location, "public/{$focus->id}".'_'."$fieldName")) {
83
+                        $secureLink = $sugar_config['site_url'].'/'.$file_location;
84 84
                     }
85 85
                     $link = $secureLink;
86
-                    $repl_arr[$key . "_" . $fieldName] = '<img src="' . $link . '" width="'.$field_def['width'].'" height="'.$field_def['height'].'"/>';
86
+                    $repl_arr[$key."_".$fieldName] = '<img src="'.$link.'" width="'.$field_def['width'].'" height="'.$field_def['height'].'"/>';
87 87
                 } else {
88
-                    $repl_arr[$key . "_" . $fieldName] = $focus->$fieldName;
88
+                    $repl_arr[$key."_".$fieldName] = $focus->$fieldName;
89 89
                 }
90 90
             }
91 91
         } // end foreach()
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
                 if ($value != '' && $value != '0.00') {
99 99
                     if ($repl_arr['aos_products_quotes_discount'] == 'Percentage') {
100 100
                         $sep = get_number_seperators();
101
-                        $value = rtrim(rtrim(format_number($value), '0'), $sep[1]);//.$app_strings['LBL_PERCENTAGE_SYMBOL'];
101
+                        $value = rtrim(rtrim(format_number($value), '0'), $sep[1]); //.$app_strings['LBL_PERCENTAGE_SYMBOL'];
102 102
                     } else {
103 103
                         $value = currency_format_number($value, $params = array('currency_symbol' => false));
104 104
                     }
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
                 }
108 108
             }
109 109
             if ($name === 'aos_products_product_image' && !empty($value)) {
110
-                $value = '<img src="' . $value . '"width="50" height="50"/>';
110
+                $value = '<img src="'.$value.'"width="50" height="50"/>';
111 111
             }
112 112
             if ($name === 'aos_products_quotes_product_qty') {
113 113
                 $sep = get_number_seperators();
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
             }
116 116
             if ($name === 'aos_products_quotes_vat' || strpos($name, 'pct') > 0 || strpos($name, 'percent') > 0 || strpos($name, 'percentage') > 0) {
117 117
                 $sep = get_number_seperators();
118
-                $value = rtrim(rtrim(format_number($value), '0'), $sep[1]) . $app_strings['LBL_PERCENTAGE_SYMBOL'];
118
+                $value = rtrim(rtrim(format_number($value), '0'), $sep[1]).$app_strings['LBL_PERCENTAGE_SYMBOL'];
119 119
             }
120 120
             if (strpos($name, 'date') > 0 || strpos($name, 'expiration') > 0) {
121 121
                 if ($value != '') {
Please login to merge, or discard this patch.
include/ListView/ListViewSubPanel.php 2 patches
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.
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
                 $this->createSmartyTemplate();
137 137
             }
138 138
 
139
-            $html_var = $this->subpanel_module . "_CELL";
139
+            $html_var = $this->subpanel_module."_CELL";
140 140
 
141 141
             $list_data = $this->processUnionBeans($sugarbean, $subpanel_def, $html_var);
142 142
 
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
                 }
292 292
             }
293 293
 
294
-            foreach($data as $aVal => $aItem) {
294
+            foreach ($data as $aVal => $aItem) {
295 295
                 $widget_contents[$aVal] = array();
296 296
                 $subpanel_item_count++;
297 297
                 $aItem->check_date_relationships_load();
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 
325 325
                 if ($this->shouldProcess) {
326 326
                     if ($aItem->ACLAccess('EditView')) {
327
-                        $widget_contents[$aVal][0] = "<input type='checkbox' class='checkbox' name='mass[]' value='" . $fields['ID'] . "' />";
327
+                        $widget_contents[$aVal][0] = "<input type='checkbox' class='checkbox' name='mass[]' value='".$fields['ID']."' />";
328 328
                     }
329 329
                     else {
330 330
                         $widget_contents[$aVal][0] = '';
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 //                    else {
336 336
 //                        $this->smartyTemplate->assign('TAG_NAME', 'span');
337 337
 //                    }
338
-                    $this->smartyTemplate->assign('CHECKALL', "<input type='checkbox'  title='" . $GLOBALS['app_strings']['LBL_SELECT_ALL_TITLE'] . "' class='checkbox' name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked);' />");
338
+                    $this->smartyTemplate->assign('CHECKALL', "<input type='checkbox'  title='".$GLOBALS['app_strings']['LBL_SELECT_ALL_TITLE']."' class='checkbox' name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked);' />");
339 339
 
340 340
                 }
341 341
                 $oddRow = !$oddRow;
@@ -415,8 +415,8 @@  discard block
 block discarded – undo
415 415
                         if ($usage != 'query_only') {
416 416
                             $list_field['name'] = $field_name;
417 417
 
418
-                            $module_field = $field_name . '_mod';
419
-                            $owner_field = $field_name . '_owner';
418
+                            $module_field = $field_name.'_mod';
419
+                            $owner_field = $field_name.'_owner';
420 420
                             if (!empty($aItem->$module_field)) {
421 421
 
422 422
                                 $list_field['owner_id'] = $aItem->$owner_field;
@@ -504,11 +504,11 @@  discard block
 block discarded – undo
504 504
                                         unset($_content);
505 505
                                     }
506 506
                                     else {
507
-                                        $doNotProcessTheseActions = array("edit_button", "close_button","remove_button");
508
-                                        if(!in_array($list_field['name'],$doNotProcessTheseActions) && '' != ($_content = $layout_manager->widgetDisplay($list_field))){
507
+                                        $doNotProcessTheseActions = array("edit_button", "close_button", "remove_button");
508
+                                        if (!in_array($list_field['name'], $doNotProcessTheseActions) && '' != ($_content = $layout_manager->widgetDisplay($list_field))) {
509 509
                                             $button_contents[$aVal][] = $_content;
510 510
                                             unset($_content);
511
-                                        }else{
511
+                                        } else {
512 512
                                             $button_contents[$aVal][] = '';
513 513
                                         }
514 514
                                     }
@@ -545,9 +545,9 @@  discard block
 block discarded – undo
545 545
             global $currentModule;
546 546
             global $app_strings;
547 547
 
548
-            if(!isset($current_offset) || empty($current_offset))
548
+            if (!isset($current_offset) || empty($current_offset))
549 549
 	    {
550
-  		$current_offset=0;
550
+  		$current_offset = 0;
551 551
 	    }
552 552
 	    $start_record = $current_offset + 1;
553 553
 
@@ -579,21 +579,21 @@  discard block
 block discarded – undo
579 579
                 $dynamic_url = '';
580 580
 
581 581
                 if ($this->is_dynamic) {
582
-                    $dynamic_url .= '&' . $this->getSessionVariableName($html_varName, 'ORDER_BY') . '=' . $this->getSessionVariable($html_varName, 'ORDER_BY') . '&sort_order=' . $this->sort_order . '&to_pdf=true&action=SubPanelViewer&subpanel=' . $this->subpanel_module;
582
+                    $dynamic_url .= '&'.$this->getSessionVariableName($html_varName, 'ORDER_BY').'='.$this->getSessionVariable($html_varName, 'ORDER_BY').'&sort_order='.$this->sort_order.'&to_pdf=true&action=SubPanelViewer&subpanel='.$this->subpanel_module;
583 583
                 }
584 584
 
585
-                $current_URL = htmlentities($this->base_URL . $current_offset . $dynamic_url);
586
-                $start_URL = htmlentities($this->base_URL . "0" . $dynamic_url);
587
-                $previous_URL = htmlentities($this->base_URL . $previous_offset . $dynamic_url);
588
-                $next_URL = htmlentities($this->base_URL . $next_offset . $dynamic_url);
589
-                $end_URL = htmlentities($this->base_URL . 'end' . $dynamic_url);
585
+                $current_URL = htmlentities($this->base_URL.$current_offset.$dynamic_url);
586
+                $start_URL = htmlentities($this->base_URL."0".$dynamic_url);
587
+                $previous_URL = htmlentities($this->base_URL.$previous_offset.$dynamic_url);
588
+                $next_URL = htmlentities($this->base_URL.$next_offset.$dynamic_url);
589
+                $end_URL = htmlentities($this->base_URL.'end'.$dynamic_url);
590 590
 
591 591
                 if (!empty($this->start_link_wrapper)) {
592
-                    $current_URL = $this->start_link_wrapper . $current_URL . $this->end_link_wrapper;
593
-                    $start_URL = $this->start_link_wrapper . $start_URL . $this->end_link_wrapper;
594
-                    $previous_URL = $this->start_link_wrapper . $previous_URL . $this->end_link_wrapper;
595
-                    $next_URL = $this->start_link_wrapper . $next_URL . $this->end_link_wrapper;
596
-                    $end_URL = $this->start_link_wrapper . $end_URL . $this->end_link_wrapper;
592
+                    $current_URL = $this->start_link_wrapper.$current_URL.$this->end_link_wrapper;
593
+                    $start_URL = $this->start_link_wrapper.$start_URL.$this->end_link_wrapper;
594
+                    $previous_URL = $this->start_link_wrapper.$previous_URL.$this->end_link_wrapper;
595
+                    $next_URL = $this->start_link_wrapper.$next_URL.$this->end_link_wrapper;
596
+                    $end_URL = $this->start_link_wrapper.$end_URL.$this->end_link_wrapper;
597 597
                 }
598 598
 
599 599
                 $moduleString = htmlspecialchars("{$currentModule}_{$html_varName}_offset");
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
                     $uids = empty($_REQUEST['uid']) || $massUpdateRun ? '' : $_REQUEST['uid'];
607 607
                     $select_entire_list = ($massUpdateRun) ? 0 : (isset($_POST['select_entire_list']) ? $_POST['select_entire_list'] : (isset($_REQUEST['select_entire_list']) ? htmlspecialchars($_REQUEST['select_entire_list']) : 0));
608 608
 
609
-                    echo "<textarea style='display: none' name='uid'>{$uids}</textarea>\n" . "<input type='hidden' name='select_entire_list' value='{$select_entire_list}'>\n" . "<input type='hidden' name='{$moduleString}' value='0'>\n" . "<input type='hidden' name='{$moduleStringOrder}' value='0'>\n";
609
+                    echo "<textarea style='display: none' name='uid'>{$uids}</textarea>\n"."<input type='hidden' name='select_entire_list' value='{$select_entire_list}'>\n"."<input type='hidden' name='{$moduleString}' value='0'>\n"."<input type='hidden' name='{$moduleStringOrder}' value='0'>\n";
610 610
 
611 611
                 }
612 612
 
@@ -614,17 +614,17 @@  discard block
 block discarded – undo
614 614
                 $GLOBALS['log']->debug("Offsets: (start, previous, next, last)(0, $previous_offset, $next_offset, $last_offset)");
615 615
 
616 616
                 if (0 == $current_offset) {
617
-                    $start_link = "<button type='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' class='button' disabled>" . SugarThemeRegistry::current()->getImage("start_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START']) . "</button>";
618
-                    $previous_link = "<button type='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' class='button' disabled>" . SugarThemeRegistry::current()->getImage("previous_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS']) . "</button>";
617
+                    $start_link = "<button type='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("start_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
618
+                    $previous_link = "<button type='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("previous_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
619 619
                 }
620 620
                 else {
621 621
                     if ($this->multi_select_popup) {// nav links for multiselect popup, submit form to save checks.
622
-                        $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='javascript:save_checks(0, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START']) . "</button>";
623
-                        $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='javascript:save_checks($previous_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS']) . "</button>";
622
+                        $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='javascript:save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
623
+                        $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='javascript:save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
624 624
                     }
625 625
                     elseif ($this->shouldProcess) {
626
-                        $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='location.href=\"$start_URL\"; sListView.save_checks(0, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START']) . "</button>";
627
-                        $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='location.href=\"$previous_URL\"; sListView.save_checks($previous_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS']) . "</button>";
626
+                        $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick='location.href=\"$start_URL\"; sListView.save_checks(0, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
627
+                        $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick='location.href=\"$previous_URL\"; sListView.save_checks($previous_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
628 628
                     }
629 629
                     else {
630 630
                         $onClick = '';
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
                         else {
635 635
                             $onClick = "'location.href=\"$start_URL\";'";
636 636
                         }
637
-                        $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=" . $onClick . ">" . SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START']) . "</button>";
637
+                        $start_link = "<button type='button' class='button' name='listViewStartButton' title='{$this->local_app_strings['LNK_LIST_START']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("start", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_START'])."</button>";
638 638
 
639 639
                         $onClick = '';
640 640
                         if (0 != preg_match('/javascript.*/', $previous_URL)) {
@@ -643,25 +643,25 @@  discard block
 block discarded – undo
643 643
                         else {
644 644
                             $onClick = "'location.href=\"$previous_URL\";'";
645 645
                         }
646
-                        $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=" . $onClick . ">" . SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS']) . "</button>";
646
+                        $previous_link = "<button type='button' class='button' name='listViewPrevButton' title='{$this->local_app_strings['LNK_LIST_PREVIOUS']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("previous", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_PREVIOUS'])."</button>";
647 647
                     }
648 648
                 }
649 649
 
650 650
                 if ($last_offset <= $current_offset) {
651
-                    $end_link = "<button type='button' name='listViewEndButton' title='{$this->local_app_strings['LNK_LIST_END']}' class='button' disabled>" . SugarThemeRegistry::current()->getImage("end_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END']) . "</button>";
652
-                    $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' disabled>" . SugarThemeRegistry::current()->getImage("next_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT']) . "</button>";
651
+                    $end_link = "<button type='button' name='listViewEndButton' title='{$this->local_app_strings['LNK_LIST_END']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("end_off", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
652
+                    $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' disabled>".SugarThemeRegistry::current()->getImage("next_off", "aborder='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
653 653
                 }
654 654
                 else {
655 655
                     if ($this->multi_select_popup) { // nav links for multiselect popup, submit form to save checks.
656
-                        $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='javascript:save_checks($last_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END']) . "</button>";
656
+                        $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='javascript:save_checks($last_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
657 657
                         if (!empty($sugar_config['disable_count_query'])) {
658 658
                             $end_link = '';
659 659
                         }
660
-                        $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' onClick='javascript:save_checks($next_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT']) . "</button>";
660
+                        $next_link = "<button type='button' name='listViewNextButton' title='{$this->local_app_strings['LNK_LIST_NEXT']}' class='button' onClick='javascript:save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
661 661
                     }
662 662
                     elseif ($this->shouldProcess) {
663
-                        $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='location.href=\"$end_URL\"; sListView.save_checks(\"end\", \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END']) . "</button>";
664
-                        $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick='location.href=\"$next_URL\"; sListView.save_checks($next_offset, \"{$moduleString}\");'>" . SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT']) . "</button>";
663
+                        $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick='location.href=\"$end_URL\"; sListView.save_checks(\"end\", \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
664
+                        $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick='location.href=\"$next_URL\"; sListView.save_checks($next_offset, \"{$moduleString}\");'>".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
665 665
                     }
666 666
                     else {
667 667
                         $onClick = '';
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
                         else {
672 672
                             $onClick = "'location.href=\"$next_URL\";'";
673 673
                         }
674
-                        $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=" . $onClick . ">" . SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT']) . "</button>";
674
+                        $next_link = "<button type='button' name='listViewNextButton' class='button' title='{$this->local_app_strings['LNK_LIST_NEXT']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("next", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_NEXT'])."</button>";
675 675
 
676 676
                         $onClick = '';
677 677
                         if (0 != preg_match('/javascript.*/', $end_URL)) {
@@ -680,7 +680,7 @@  discard block
 block discarded – undo
680 680
                         else {
681 681
                             $onClick = "'location.href=\"$end_URL\";'";
682 682
                         }
683
-                        $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=" . $onClick . ">" . SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END']) . "</button>";
683
+                        $end_link = "<button type='button' name='listViewEndButton' class='button' title='{$this->local_app_strings['LNK_LIST_END']}' onClick=".$onClick.">".SugarThemeRegistry::current()->getImage("end", "border='0' align='absmiddle'", null, null, '.gif', $this->local_app_strings['LNK_LIST_END'])."</button>";
684 684
 
685 685
                     }
686 686
                 }
@@ -690,14 +690,14 @@  discard block
 block discarded – undo
690 690
 
691 691
                 $end_record = $end_record - 1;
692 692
 
693
-                $script_href = "<a style=\'width: 150px\' name=\"thispage\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $this->records_per_page)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$this->records_per_page}&#x29;&#x200E;</a>" . "<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>" . "<a style=\'width: 150px\' name=\"deselect\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.clear_all(document.MassUpdate, \"mass[]\", false);\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_NONE']}</a>";
693
+                $script_href = "<a style=\'width: 150px\' name=\"thispage\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $this->records_per_page)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$this->records_per_page}&#x29;&#x200E;</a>"."<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>"."<a style=\'width: 150px\' name=\"deselect\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.clear_all(document.MassUpdate, \"mass[]\", false);\' href=\'#\'>{$this->local_app_strings['LBL_LISTVIEW_NONE']}</a>";
694 694
 
695 695
                 $close_inline_img = SugarThemeRegistry::current()->getImage('close_inline', 'border=0', null, null, ".gif", $app_strings['LBL_CLOSEINLINE']);
696 696
 
697 697
                 echo "<script>
698 698
                 function select_dialog() {
699 699
                 	var \$dialog = \$('<div></div>')
700
-					.html('<a style=\'width: 150px\' name=\"thispage\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $this->records_per_page)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};\' href=\'javascript:void(0)\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$this->records_per_page}&#x29;&#x200E;</a>" . "<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'javascript:void(0)\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>" . "<a style=\'width: 150px\' name=\"deselect\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.clear_all(document.MassUpdate, \"mass[]\", false);\' href=\'javascript:void(0)\'>{$this->local_app_strings['LBL_LISTVIEW_NONE']}</a>')
700
+					.html('<a style=\'width: 150px\' name=\"thispage\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $this->records_per_page)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};\' href=\'javascript:void(0)\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$this->records_per_page}&#x29;&#x200E;</a>"."<a style=\'width: 150px\' name=\"selectall\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$row_count});\' href=\'javascript:void(0)\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$row_count}&#x29;&#x200E;</a>"."<a style=\'width: 150px\' name=\"deselect\" class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'sListView.clear_all(document.MassUpdate, \"mass[]\", false);\' href=\'javascript:void(0)\'>{$this->local_app_strings['LBL_LISTVIEW_NONE']}</a>')
701 701
 					.dialog({
702 702
 						autoOpen: false,
703 703
 						width: 150
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
                     if (!empty($GLOBALS['sugar_config']['disable_count_query']) && $GLOBALS['sugar_config']['disable_count_query'] === true && $total > $pageTotal) {
715 715
                         $this->show_plus = true;
716 716
                         $total = $pageTotal;
717
-                        $total_label = $total . '+';
717
+                        $total_label = $total.'+';
718 718
                     }
719 719
                     else {
720 720
                         $this->show_plus = false;
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
                     //Bug#52931: Replace with actionMenu
726 726
                     //$select_link = "<a id='select_link' onclick='return select_dialog();' href=\"javascript:void(0)\">".$this->local_app_strings['LBL_LINK_SELECT']."&nbsp;".SugarThemeRegistry::current()->getImage('MoreDetail', 'border=0', 11, 7, '.png', $app_strings['LBL_MOREDETAIL'])."</a>";
727 727
                     $menuItems = array(
728
-                        "<input title=\"" . $app_strings['LBL_SELECT_ALL_TITLE'] . "\" type='checkbox' class='checkbox massall' name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked);' /><a href='javascript: void(0);'></a>", "<a  name='thispage' id='button_select_this_page' class='menuItem' onmouseover='hiliteItem(this,\"yes\");' onmouseout='unhiliteItem(this);' onclick='if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $pageTotal)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};' href='#'>{$app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$pageTotal}&#x29;&#x200E;</a>", "<a  name='selectall' id='button_select_all' class='menuItem' onmouseover='hiliteItem(this,\"yes\");' onmouseout='unhiliteItem(this);' onclick='sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$total});' href='#'>{$app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$total_label}&#x29;&#x200E;</a>", "<a name='deselect' id='button_deselect' class='menuItem' onmouseover='hiliteItem(this,\"yes\");' onmouseout='unhiliteItem(this);' onclick='sListView.clear_all(document.MassUpdate, \"mass[]\", false);' href='#'>{$app_strings['LBL_LISTVIEW_NONE']}</a>",
728
+                        "<input title=\"".$app_strings['LBL_SELECT_ALL_TITLE']."\" type='checkbox' class='checkbox massall' name='massall' id='massall' value='' onclick='sListView.check_all(document.MassUpdate, \"mass[]\", this.checked);' /><a href='javascript: void(0);'></a>", "<a  name='thispage' id='button_select_this_page' class='menuItem' onmouseover='hiliteItem(this,\"yes\");' onmouseout='unhiliteItem(this);' onclick='if (document.MassUpdate.select_entire_list.value==1){document.MassUpdate.select_entire_list.value=0;sListView.check_all(document.MassUpdate, \"mass[]\", true, $pageTotal)}else {sListView.check_all(document.MassUpdate, \"mass[]\", true)};' href='#'>{$app_strings['LBL_LISTVIEW_OPTION_CURRENT']}&nbsp;&#x28;{$pageTotal}&#x29;&#x200E;</a>", "<a  name='selectall' id='button_select_all' class='menuItem' onmouseover='hiliteItem(this,\"yes\");' onmouseout='unhiliteItem(this);' onclick='sListView.check_entire_list(document.MassUpdate, \"mass[]\",true,{$total});' href='#'>{$app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}&nbsp;&#x28;{$total_label}&#x29;&#x200E;</a>", "<a name='deselect' id='button_deselect' class='menuItem' onmouseover='hiliteItem(this,\"yes\");' onmouseout='unhiliteItem(this);' onclick='sListView.clear_all(document.MassUpdate, \"mass[]\", false);' href='#'>{$app_strings['LBL_LISTVIEW_NONE']}</a>",
729 729
                     );
730 730
                     require_once('include/Smarty/plugins/function.sugar_action_menu.php');
731 731
                     $select_link = smarty_function_sugar_action_menu(array(
@@ -737,10 +737,10 @@  discard block
 block discarded – undo
737 737
                     $select_link = "&nbsp;";
738 738
                 }
739 739
 
740
-                $export_link = '<input class="button" type="button" value="' . $this->local_app_strings['LBL_EXPORT'] . '" ' . 'onclick="return sListView.send_form(true, \'' . $_REQUEST['module'] . '\', \'index.php?entryPoint=export\',\'' . $this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'] . '\')">';
740
+                $export_link = '<input class="button" type="button" value="'.$this->local_app_strings['LBL_EXPORT'].'" '.'onclick="return sListView.send_form(true, \''.$_REQUEST['module'].'\', \'index.php?entryPoint=export\',\''.$this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'].'\')">';
741 741
 
742 742
                 if ($this->show_delete_button) {
743
-                    $delete_link = '<input class="button" type="button" id="delete_button" name="Delete" value="' . $this->local_app_strings['LBL_DELETE_BUTTON_LABEL'] . '" onclick="return sListView.send_mass_update(\'selected\',\'' . $this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'] . '\', 1)">';
743
+                    $delete_link = '<input class="button" type="button" id="delete_button" name="Delete" value="'.$this->local_app_strings['LBL_DELETE_BUTTON_LABEL'].'" onclick="return sListView.send_mass_update(\'selected\',\''.$this->local_app_strings['LBL_LISTVIEW_NO_SELECTED'].'\', 1)">';
744 744
                 }
745 745
                 else {
746 746
                     $delete_link = '&nbsp;';
@@ -750,7 +750,7 @@  discard block
 block discarded – undo
750 750
                 $admin->retrieveSettings('system');
751 751
 
752 752
                 $user_merge = $current_user->getPreference('mailmerge_on');
753
-                if($user_merge == 'on' && isset($admin->settings['system_mailmerge_on']) && $admin->settings['system_mailmerge_on']) {
753
+                if ($user_merge == 'on' && isset($admin->settings['system_mailmerge_on']) && $admin->settings['system_mailmerge_on']) {
754 754
                     echo "<script>
755 755
                 function mailmerge_dialog(el) {
756 756
                    	var \$dialog = \$('<div></div>')
@@ -759,7 +759,7 @@  discard block
 block discarded – undo
759 759
                         . "<a  class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' href=\'index.php?action=index&module=MailMerge&entire=true\'>{$this->local_app_strings['LBL_LISTVIEW_OPTION_ENTIRE']}</a>')
760 760
 					.dialog({
761 761
 						autoOpen: false,
762
-						title: '". $this->local_app_strings['LBL_MAILMERGE']."',
762
+						title: '".$this->local_app_strings['LBL_MAILMERGE']."',
763 763
 						width: 150,
764 764
 						position: {
765 765
 						    my: myPos,
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
                     $merge_link = "&nbsp;";
776 776
                 }
777 777
 
778
-                $selected_objects_span = "&nbsp;|&nbsp;{$this->local_app_strings['LBL_LISTVIEW_SELECTED_OBJECTS']}<input  style='border: 0px; background: transparent; font-size: inherit; color: inherit' type='text' readonly name='selectCount[]' value='" . ((isset($_POST['mass'])) ? count($_POST['mass']) : 0) . "' />";
778
+                $selected_objects_span = "&nbsp;|&nbsp;{$this->local_app_strings['LBL_LISTVIEW_SELECTED_OBJECTS']}<input  style='border: 0px; background: transparent; font-size: inherit; color: inherit' type='text' readonly name='selectCount[]' value='".((isset($_POST['mass'])) ? count($_POST['mass']) : 0)."' />";
779 779
 
780 780
                 if ($_REQUEST['module'] == 'Home' || $this->local_current_module == 'Import' || $this->show_export_button == false || (!empty($sugar_config['disable_export'])) || (!empty($sugar_config['admin_export_only']) && !(is_admin($current_user) || (ACLController::moduleSupportsACL($_REQUEST['module']) && ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'access') == ACL_ALLOW_ENABLED && (ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'admin') == ACL_ALLOW_ADMIN || ACLAction::getUserAccessLevel($current_user->id, $_REQUEST['module'], 'admin') == ACL_ALLOW_ADMIN_DEV))))) {
781 781
                     if ($_REQUEST['module'] != 'InboundEmail' && $_REQUEST['module'] != 'EmailMan' && $_REQUEST['module'] != 'iFrames') {
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
807 807
 
808 808
                         //attempt to get the query to recreate this subpanel
809 809
                         if (!empty($this->response)) {
810
-                            $response =& $this->response;
810
+                            $response = & $this->response;
811 811
                         }
812 812
                         else {
813 813
                             $response = SugarBean::get_union_related_list($sugarbean, $this->sortby, $this->sort_order, $this->query_where, $current_offset, -1, $this->records_per_page, $this->query_limit, $subpanel_def);
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
824 824
                     else {
825 825
                         $html_text .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr><td align=\"left\"  nowrap>$select_link&nbsp;$export_link&nbsp;$delete_link&nbsp;$selected_objects_span";
826 826
                     }
827
-                    $html_text .= "</td>\n<td nowrap align=\"right\">" . $start_link . "&nbsp;&nbsp;" . $previous_link . "&nbsp;&nbsp;<span class='pageNumbers'>(" . $start_record . " - " . $end_record . " " . $this->local_app_strings['LBL_LIST_OF'] . " " . $row_count . ")</span>&nbsp;&nbsp;" . $next_link . "&nbsp;&nbsp;" . $end_link . "</td></tr></table>\n";
827
+                    $html_text .= "</td>\n<td nowrap align=\"right\">".$start_link."&nbsp;&nbsp;".$previous_link."&nbsp;&nbsp;<span class='pageNumbers'>(".$start_record." - ".$end_record." ".$this->local_app_strings['LBL_LIST_OF']." ".$row_count.")</span>&nbsp;&nbsp;".$next_link."&nbsp;&nbsp;".$end_link."</td></tr></table>\n";
828 828
                     $html_text .= "</td>\n";
829 829
                     $html_text .= "</tr>\n";
830 830
                     $this->smartyTemplate->assign("PAGINATION", $html_text);
@@ -843,42 +843,42 @@  discard block
 block discarded – undo
843 843
                 $this->base_URL = $_SERVER['PHP_SELF'];
844 844
 
845 845
                 if (isset($_SERVER['QUERY_STRING'])) {
846
-                    $this->base_URL = preg_replace("/\&" . $this->getSessionVariableName($html_varName, "ORDER_BY") . "=[0-9a-zA-Z\_\.]*/", "", $this->base_URL . '?' . $_SERVER['QUERY_STRING']);
847
-                    $this->base_URL = preg_replace("/\&" . $this->getSessionVariableName($html_varName, "offset") . "=[0-9]*/", "", $this->base_URL);
846
+                    $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName, "ORDER_BY")."=[0-9a-zA-Z\_\.]*/", "", $this->base_URL.'?'.$_SERVER['QUERY_STRING']);
847
+                    $this->base_URL = preg_replace("/\&".$this->getSessionVariableName($html_varName, "offset")."=[0-9]*/", "", $this->base_URL);
848 848
                 }
849 849
                 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
850 850
                     $this->base_URL .= '?';
851 851
                     if (isset($_REQUEST['action'])) {
852
-                        $this->base_URL .= '&action=' . $_REQUEST['action'];
852
+                        $this->base_URL .= '&action='.$_REQUEST['action'];
853 853
                     }
854 854
                     if (isset($_REQUEST['record'])) {
855
-                        $this->base_URL .= '&record=' . $_REQUEST['record'];
855
+                        $this->base_URL .= '&record='.$_REQUEST['record'];
856 856
                     }
857 857
                     if (isset($_REQUEST['module'])) {
858
-                        $this->base_URL .= '&module=' . $_REQUEST['module'];
858
+                        $this->base_URL .= '&module='.$_REQUEST['module'];
859 859
                     }
860 860
                 }
861
-                $this->base_URL .= "&" . $this->getSessionVariableName($html_varName, "offset") . "=";
861
+                $this->base_URL .= "&".$this->getSessionVariableName($html_varName, "offset")."=";
862 862
             }
863 863
 
864 864
             if ($this->is_dynamic) {
865
-                $this->base_URL .= '&to_pdf=true&action=SubPanelViewer&subpanel=' . $this->source_module;
865
+                $this->base_URL .= '&to_pdf=true&action=SubPanelViewer&subpanel='.$this->source_module;
866 866
             }
867 867
 
868 868
             //bug43465 start
869 869
             if (isset($this->appendToBaseUrl) && is_array($this->appendToBaseUrl)) {
870 870
                 foreach ($this->appendToBaseUrl as $key => $value) {
871
-                    $fullRequestString = $key . '=' . $value;
871
+                    $fullRequestString = $key.'='.$value;
872 872
 
873 873
                     if ($this->base_URL == "/index.php") {
874 874
                         $this->base_URL .= "?";
875 875
                     }
876 876
                     else {
877
-                        if ($fullRequestString == substr($this->baseURL, '-' . strlen($fullRequestString))) {
878
-                            $this->base_URL = preg_replace("/&" . $key . "\=.*/", "", $this->base_URL);
877
+                        if ($fullRequestString == substr($this->baseURL, '-'.strlen($fullRequestString))) {
878
+                            $this->base_URL = preg_replace("/&".$key."\=.*/", "", $this->base_URL);
879 879
                         }
880 880
                         else {
881
-                            $this->base_URL = preg_replace("/&" . $key . "\=.*?&/", "&", $this->base_URL);
881
+                            $this->base_URL = preg_replace("/&".$key."\=.*?&/", "&", $this->base_URL);
882 882
                         }
883 883
                         $this->base_URL .= "&";
884 884
                     }
@@ -889,7 +889,7 @@  discard block
 block discarded – undo
889 889
             }
890 890
             //bug43465 end
891 891
 
892
-            $sort_URL_base = $this->base_URL . "&" . $this->getSessionVariableName($html_varName, "ORDER_BY") . "=";
892
+            $sort_URL_base = $this->base_URL."&".$this->getSessionVariableName($html_varName, "ORDER_BY")."=";
893 893
 
894 894
             if ($sort_URL_base !== "") {
895 895
                 $this->smartyTemplate->assign("ORDER_BY", $sort_URL_base);
Please login to merge, or discard this patch.
custom/modules/Accounts/metadata/listviewdefs.php 2 patches
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.
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -1,33 +1,33 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $listViewDefs ['Accounts'] = 
3
-array (
3
+array(
4 4
   'NAME' => 
5
-  array (
5
+  array(
6 6
     'width' => '20%',
7 7
     'label' => 'LBL_LIST_ACCOUNT_NAME',
8 8
     'link' => true,
9 9
     'default' => true,
10 10
   ),
11 11
   'BILLING_ADDRESS_COUNTRY' => 
12
-  array (
12
+  array(
13 13
     'width' => '10%',
14 14
     'label' => 'LBL_BILLING_ADDRESS_COUNTRY',
15 15
     'default' => true,
16 16
   ),
17 17
   'BILLING_ADDRESS_CITY' => 
18
-  array (
18
+  array(
19 19
     'width' => '10%',
20 20
     'label' => 'LBL_LIST_CITY',
21 21
     'default' => true,
22 22
   ),
23 23
   'PHONE_OFFICE' => 
24
-  array (
24
+  array(
25 25
     'width' => '10%',
26 26
     'label' => 'LBL_LIST_PHONE',
27 27
     'default' => true,
28 28
   ),
29 29
   'ASSIGNED_USER_NAME' => 
30
-  array (
30
+  array(
31 31
     'width' => '10%',
32 32
     'label' => 'LBL_LIST_ASSIGNED_USER',
33 33
     'module' => 'Employees',
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
     'default' => true,
36 36
   ),
37 37
   'EMAIL1' => 
38
-  array (
38
+  array(
39 39
     'width' => '15%',
40 40
     'label' => 'LBL_EMAIL_ADDRESS',
41 41
     'sortable' => false,
@@ -44,139 +44,139 @@  discard block
 block discarded – undo
44 44
     'default' => true,
45 45
   ),
46 46
   'DATE_ENTERED' => 
47
-  array (
47
+  array(
48 48
     'width' => '5%',
49 49
     'label' => 'LBL_DATE_ENTERED',
50 50
     'default' => true,
51 51
   ),
52 52
   'ACCOUNT_TYPE' => 
53
-  array (
53
+  array(
54 54
     'width' => '10%',
55 55
     'label' => 'LBL_TYPE',
56 56
     'default' => false,
57 57
   ),
58 58
   'INDUSTRY' => 
59
-  array (
59
+  array(
60 60
     'width' => '10%',
61 61
     'label' => 'LBL_INDUSTRY',
62 62
     'default' => false,
63 63
   ),
64 64
   'ANNUAL_REVENUE' => 
65
-  array (
65
+  array(
66 66
     'width' => '10%',
67 67
     'label' => 'LBL_ANNUAL_REVENUE',
68 68
     'default' => false,
69 69
   ),
70 70
   'PHONE_FAX' => 
71
-  array (
71
+  array(
72 72
     'width' => '10%',
73 73
     'label' => 'LBL_PHONE_FAX',
74 74
     'default' => false,
75 75
   ),
76 76
   'BILLING_ADDRESS_STREET' => 
77
-  array (
77
+  array(
78 78
     'width' => '15%',
79 79
     'label' => 'LBL_BILLING_ADDRESS_STREET',
80 80
     'default' => false,
81 81
   ),
82 82
   'BILLING_ADDRESS_STATE' => 
83
-  array (
83
+  array(
84 84
     'width' => '7%',
85 85
     'label' => 'LBL_BILLING_ADDRESS_STATE',
86 86
     'default' => false,
87 87
   ),
88 88
   'BILLING_ADDRESS_POSTALCODE' => 
89
-  array (
89
+  array(
90 90
     'width' => '10%',
91 91
     'label' => 'LBL_BILLING_ADDRESS_POSTALCODE',
92 92
     'default' => false,
93 93
   ),
94 94
   'SHIPPING_ADDRESS_STREET' => 
95
-  array (
95
+  array(
96 96
     'width' => '15%',
97 97
     'label' => 'LBL_SHIPPING_ADDRESS_STREET',
98 98
     'default' => false,
99 99
   ),
100 100
   'SHIPPING_ADDRESS_CITY' => 
101
-  array (
101
+  array(
102 102
     'width' => '10%',
103 103
     'label' => 'LBL_SHIPPING_ADDRESS_CITY',
104 104
     'default' => false,
105 105
   ),
106 106
   'SHIPPING_ADDRESS_STATE' => 
107
-  array (
107
+  array(
108 108
     'width' => '7%',
109 109
     'label' => 'LBL_SHIPPING_ADDRESS_STATE',
110 110
     'default' => false,
111 111
   ),
112 112
   'SHIPPING_ADDRESS_POSTALCODE' => 
113
-  array (
113
+  array(
114 114
     'width' => '10%',
115 115
     'label' => 'LBL_SHIPPING_ADDRESS_POSTALCODE',
116 116
     'default' => false,
117 117
   ),
118 118
   'SHIPPING_ADDRESS_COUNTRY' => 
119
-  array (
119
+  array(
120 120
     'width' => '10%',
121 121
     'label' => 'LBL_SHIPPING_ADDRESS_COUNTRY',
122 122
     'default' => false,
123 123
   ),
124 124
   'RATING' => 
125
-  array (
125
+  array(
126 126
     'width' => '10%',
127 127
     'label' => 'LBL_RATING',
128 128
     'default' => false,
129 129
   ),
130 130
   'PHONE_ALTERNATE' => 
131
-  array (
131
+  array(
132 132
     'width' => '10%',
133 133
     'label' => 'LBL_OTHER_PHONE',
134 134
     'default' => false,
135 135
   ),
136 136
   'WEBSITE' => 
137
-  array (
137
+  array(
138 138
     'width' => '10%',
139 139
     'label' => 'LBL_WEBSITE',
140 140
     'default' => false,
141 141
   ),
142 142
   'OWNERSHIP' => 
143
-  array (
143
+  array(
144 144
     'width' => '10%',
145 145
     'label' => 'LBL_OWNERSHIP',
146 146
     'default' => false,
147 147
   ),
148 148
   'EMPLOYEES' => 
149
-  array (
149
+  array(
150 150
     'width' => '10%',
151 151
     'label' => 'LBL_EMPLOYEES',
152 152
     'default' => false,
153 153
   ),
154 154
   'SIC_CODE' => 
155
-  array (
155
+  array(
156 156
     'width' => '10%',
157 157
     'label' => 'LBL_SIC_CODE',
158 158
     'default' => false,
159 159
   ),
160 160
   'TICKER_SYMBOL' => 
161
-  array (
161
+  array(
162 162
     'width' => '10%',
163 163
     'label' => 'LBL_TICKER_SYMBOL',
164 164
     'default' => false,
165 165
   ),
166 166
   'DATE_MODIFIED' => 
167
-  array (
167
+  array(
168 168
     'width' => '5%',
169 169
     'label' => 'LBL_DATE_MODIFIED',
170 170
     'default' => false,
171 171
   ),
172 172
   'CREATED_BY_NAME' => 
173
-  array (
173
+  array(
174 174
     'width' => '10%',
175 175
     'label' => 'LBL_CREATED',
176 176
     'default' => false,
177 177
   ),
178 178
   'MODIFIED_BY_NAME' => 
179
-  array (
179
+  array(
180 180
     'width' => '10%',
181 181
     'label' => 'LBL_MODIFIED',
182 182
     'default' => false,
Please login to merge, or discard this patch.
custom/modules/Accounts/language/it_IT.lang.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1 1
 <?php
2 2
 // created: 2017-10-13 13:01:25
3
-$mod_strings = array (
3
+$mod_strings = array(
4 4
 );
5 5
\ No newline at end of file
Please login to merge, or discard this patch.