Completed
Push — console-installer ( 186d32...cb4007 )
by Adam
91:14 queued 78:40
created
modules/SchedulersJobs/field_arrays.php 1 patch
Spacing   +5 added lines, -5 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.
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
  ********************************************************************************/
40 40
 
41 41
 
42
-$fields_array['Schedulers_jobs'] = array (
43
-	'column_fields' => array (
42
+$fields_array['Schedulers_jobs'] = array(
43
+	'column_fields' => array(
44 44
 		'id',
45 45
 		'deleted',
46 46
 		'date_entered',
@@ -49,12 +49,12 @@  discard block
 block discarded – undo
49 49
 		'execute_time',
50 50
 		'status',
51 51
 	),
52
-	'list_fields' => array (
52
+	'list_fields' => array(
53 53
 		'id',
54 54
 		'job_id',
55 55
 		'execute_time'
56 56
 	),
57
-	'required_fields' => array (
57
+	'required_fields' => array(
58 58
 		'job_id' => 1,
59 59
 		'execute_time' => 1
60 60
 	)
Please login to merge, or discard this patch.
modules/Import/ImportFieldSanitize.php 1 patch
Spacing   +36 added lines, -36 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
 /*********************************************************************************
5 5
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -87,24 +87,24 @@  discard block
 block discarded – undo
87 87
     {
88 88
         static $sfh;
89 89
         
90
-        if(!isset($sfh)) {
90
+        if (!isset($sfh)) {
91 91
             require_once('include/SugarFields/SugarFieldHandler.php');
92 92
             $sfh = new SugarFieldHandler();
93 93
         }
94 94
         $value = $params[0];
95 95
         $vardef = $params[1];
96
-        if ( isset($params[2]) )
96
+        if (isset($params[2]))
97 97
             $focus = $params[2];
98 98
         else
99 99
             $focus = null;
100
-        if ( $name == 'relate' && !empty($params[3]) )
100
+        if ($name == 'relate' && !empty($params[3]))
101 101
             $this->addRelatedBean = true;
102 102
         else
103 103
             $this->addRelatedBean = false;
104 104
         
105 105
         $field = $sfh->getSugarField(ucfirst($name));
106
-        if ( $field instanceOf SugarFieldBase ) {
107
-            $value = $field->importSanitize($value,$vardef,$focus,$this);
106
+        if ($field instanceOf SugarFieldBase) {
107
+            $value = $field->importSanitize($value, $vardef, $focus, $this);
108 108
         }
109 109
         
110 110
         return $value;
@@ -128,10 +128,10 @@  discard block
 block discarded – undo
128 128
 
129 129
         $format = $this->dateformat;
130 130
 
131
-        if ( !$timedate->check_matching_format($value, $format) )
131
+        if (!$timedate->check_matching_format($value, $format))
132 132
             return false;
133 133
 
134
-        if ( !$this->isValidTimeDate($value, $format) )
134
+        if (!$this->isValidTimeDate($value, $format))
135 135
             return false;
136 136
 
137 137
         $value = $timedate->swap_formats(
@@ -156,11 +156,11 @@  discard block
 block discarded – undo
156 156
         // cache $sea instance
157 157
         static $sea;
158 158
         
159
-        if ( !($sea instanceof SugarEmailAddress) ) {
159
+        if (!($sea instanceof SugarEmailAddress)) {
160 160
             $sea = new SugarEmailAddress;
161 161
         }
162 162
         
163
-        if ( !empty($value) && !preg_match($sea->regex,$value) ) {
163
+        if (!empty($value) && !preg_match($sea->regex, $value)) {
164 164
             return false;
165 165
         }
166 166
 
@@ -184,18 +184,18 @@  discard block
 block discarded – undo
184 184
         static $focus_user;
185 185
 
186 186
         // cache this object since we'll be reusing it a bunch
187
-        if ( !($focus_user instanceof User) ) {
187
+        if (!($focus_user instanceof User)) {
188 188
 
189 189
             $focus_user = new User();
190 190
         }
191 191
 
192 192
 
193
-        if ( !empty($value) && strtolower($value) != "all" ) {
194
-            $theList   = explode(",",$value);
193
+        if (!empty($value) && strtolower($value) != "all") {
194
+            $theList   = explode(",", $value);
195 195
             $isValid   = true;
196 196
             $bad_names = array();
197 197
             foreach ($theList as $eachItem) {
198
-                if ( $focus_user->retrieve_user_id($eachItem)
198
+                if ($focus_user->retrieve_user_id($eachItem)
199 199
                         || $focus_user->retrieve($eachItem)
200 200
                 ) {
201 201
                     // all good
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
                     continue;
207 207
                 }
208 208
             }
209
-            if(!$isValid) {
209
+            if (!$isValid) {
210 210
                 return false;
211 211
             }
212 212
         }
@@ -232,10 +232,10 @@  discard block
 block discarded – undo
232 232
 
233 233
         $format = $this->timeformat;
234 234
 
235
-        if ( !$timedate->check_matching_format($value, $format) )
235
+        if (!$timedate->check_matching_format($value, $format))
236 236
             return false;
237 237
 
238
-        if ( !$this->isValidTimeDate($value, $format) )
238
+        if (!$this->isValidTimeDate($value, $format))
239 239
             return false;
240 240
 
241 241
         $value = $timedate->swap_formats(
@@ -266,46 +266,46 @@  discard block
 block discarded – undo
266 266
         $reg = $timedate->get_regular_expression($format);
267 267
         preg_match('@'.$reg['format'].'@', $value, $dateparts);
268 268
 
269
-        if ( empty($dateparts) )
269
+        if (empty($dateparts))
270 270
             return false;
271
-        if ( isset($reg['positions']['a'])
272
-                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) )
271
+        if (isset($reg['positions']['a'])
272
+                && !in_array($dateparts[$reg['positions']['a']], array('am', 'pm')))
273 273
             return false;
274
-        if ( isset($reg['positions']['A'])
275
-                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) )
274
+        if (isset($reg['positions']['A'])
275
+                && !in_array($dateparts[$reg['positions']['A']], array('AM', 'PM')))
276 276
             return false;
277
-        if ( isset($reg['positions']['h']) && (
277
+        if (isset($reg['positions']['h']) && (
278 278
                 !is_numeric($dateparts[$reg['positions']['h']])
279 279
                 || $dateparts[$reg['positions']['h']] < 1
280
-                || $dateparts[$reg['positions']['h']] > 12 ) )
280
+                || $dateparts[$reg['positions']['h']] > 12 ))
281 281
             return false;
282
-        if ( isset($reg['positions']['H']) && (
282
+        if (isset($reg['positions']['H']) && (
283 283
                 !is_numeric($dateparts[$reg['positions']['H']])
284 284
                 || $dateparts[$reg['positions']['H']] < 0
285
-                || $dateparts[$reg['positions']['H']] > 23 ) )
285
+                || $dateparts[$reg['positions']['H']] > 23 ))
286 286
             return false;
287
-        if ( isset($reg['positions']['i']) && (
287
+        if (isset($reg['positions']['i']) && (
288 288
                 !is_numeric($dateparts[$reg['positions']['i']])
289 289
                 || $dateparts[$reg['positions']['i']] < 0
290
-                || $dateparts[$reg['positions']['i']] > 59 ) )
290
+                || $dateparts[$reg['positions']['i']] > 59 ))
291 291
             return false;
292
-        if ( isset($reg['positions']['s']) && (
292
+        if (isset($reg['positions']['s']) && (
293 293
                 !is_numeric($dateparts[$reg['positions']['s']])
294 294
                 || $dateparts[$reg['positions']['s']] < 0
295
-                || $dateparts[$reg['positions']['s']] > 59 ) )
295
+                || $dateparts[$reg['positions']['s']] > 59 ))
296 296
             return false;
297
-        if ( isset($reg['positions']['d']) && (
297
+        if (isset($reg['positions']['d']) && (
298 298
                 !is_numeric($dateparts[$reg['positions']['d']])
299 299
                 || $dateparts[$reg['positions']['d']] < 1
300
-                || $dateparts[$reg['positions']['d']] > 31 ) )
300
+                || $dateparts[$reg['positions']['d']] > 31 ))
301 301
             return false;
302
-        if ( isset($reg['positions']['m']) && (
302
+        if (isset($reg['positions']['m']) && (
303 303
                 !is_numeric($dateparts[$reg['positions']['m']])
304 304
                 || $dateparts[$reg['positions']['m']] < 1
305
-                || $dateparts[$reg['positions']['m']] > 12 ) )
305
+                || $dateparts[$reg['positions']['m']] > 12 ))
306 306
             return false;
307
-        if ( isset($reg['positions']['Y']) &&
308
-                !is_numeric($dateparts[$reg['positions']['Y']]) )
307
+        if (isset($reg['positions']['Y']) &&
308
+                !is_numeric($dateparts[$reg['positions']['Y']]))
309 309
             return false;
310 310
 
311 311
         return true;
Please login to merge, or discard this patch.
modules/Import/maps/ImportMapGoogle.php 1 patch
Spacing   +5 added lines, -5 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.
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
              'email2' => array('sugar_key' => 'email2', 'sugar_label' => 'LBL_OTHER_EMAIL_ADDRESS', 'default_label' => 'Other Email'),
87 87
 
88 88
              'assigned_user_name' => array('sugar_key' => 'assigned_user_name', 'sugar_help_key' => 'LBL_EXTERNAL_ASSIGNED_TOOLTIP', 'sugar_label' => 'LBL_ASSIGNED_TO_NAME', 'default_label' => 'Assigned To'),
89
-             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP','sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
89
+             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP', 'sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
90 90
             );
91 91
 
92
-        if($module == 'Users')
92
+        if ($module == 'Users')
93 93
         {
94
-            $return_array['status'] =  array('sugar_key' => 'status', 'sugar_label' => '', 'default_label' => 'Status');
95
-            $return_array['full_name'] =  array('sugar_key' => 'user_name', 'sugar_label' => '', 'default_label' => 'Full Name');
94
+            $return_array['status'] = array('sugar_key' => 'status', 'sugar_label' => '', 'default_label' => 'Status');
95
+            $return_array['full_name'] = array('sugar_key' => 'user_name', 'sugar_label' => '', 'default_label' => 'Full Name');
96 96
         }
97 97
         return $return_array;
98 98
     }
Please login to merge, or discard this patch.
modules/Import/maps/ImportMapSalesforce.php 1 patch
Spacing   +2 added lines, -2 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.
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		$module
159 159
 		)
160 160
 	{
161
-		return array_merge(parent::getIgnoredFields($module),array('id'));
161
+		return array_merge(parent::getIgnoredFields($module), array('id'));
162 162
 	}
163 163
 }
164 164
 
Please login to merge, or discard this patch.
modules/Import/maps/ImportMapOther.php 1 patch
Spacing   +2 added lines, -2 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.
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
             break;
127 127
         case 'Opportunities':
128 128
             return array(
129
-                "Opportunity Name"=>"name" ,
129
+                "Opportunity Name"=>"name",
130 130
                 "Type"=>"opportunity_type",
131 131
                 "Lead Source"=>"lead_source",
132 132
                 "Amount"=>"amount",
Please login to merge, or discard this patch.
modules/Import/maps/ImportMap.php 1 patch
Spacing   +38 added lines, -38 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.
@@ -107,11 +107,11 @@  discard block
 block discarded – undo
107 107
     public function getMapping()
108 108
     {
109 109
         $mapping_arr = array();
110
-        if ( !empty($this->content) )
110
+        if (!empty($this->content))
111 111
         {
112
-            $pairs = explode("&",$this->content);
113
-            foreach ($pairs as $pair){
114
-                list($name,$value) = explode("=",$pair);
112
+            $pairs = explode("&", $this->content);
113
+            foreach ($pairs as $pair) {
114
+                list($name, $value) = explode("=", $pair);
115 115
                 $mapping_arr[trim($name)] = $value;
116 116
             }
117 117
         }
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
         $mapping_arr
129 129
         )
130 130
     {
131
-        $output = array ();
131
+        $output = array();
132 132
         foreach ($mapping_arr as $key => $item) {
133 133
             $output[] = "$key=$item";
134 134
         }
@@ -143,11 +143,11 @@  discard block
 block discarded – undo
143 143
     public function getDefaultValues()
144 144
     {
145 145
         $defa_arr = array();
146
-        if ( !empty($this->default_values) )
146
+        if (!empty($this->default_values))
147 147
         {
148
-            $pairs = explode("&",$this->default_values);
149
-            foreach ($pairs as $pair){
150
-                list($name,$value) = explode("=",$pair);
148
+            $pairs = explode("&", $this->default_values);
149
+            foreach ($pairs as $pair) {
150
+                list($name, $value) = explode("=", $pair);
151 151
                 $defa_arr[trim($name)] = $value;
152 152
             }
153 153
         }
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         $defa_arr
165 165
         )
166 166
     {
167
-        $output = array ();
167
+        $output = array();
168 168
         foreach ($defa_arr as $key => $item) {
169 169
             $output[] = "$key=$item";
170 170
         }
@@ -174,15 +174,15 @@  discard block
 block discarded – undo
174 174
     /**
175 175
      * @see SugarBean::retrieve()
176 176
      */
177
-    public function retrieve($id = -1, $encode=true,$deleted=true)
177
+    public function retrieve($id = -1, $encode = true, $deleted = true)
178 178
 	{
179
-	    $returnVal = parent::retrieve($id,$encode,$deleted);
179
+	    $returnVal = parent::retrieve($id, $encode, $deleted);
180 180
 
181
-	    if ( !($returnVal instanceOf $this) ) {
181
+	    if (!($returnVal instanceOf $this)) {
182 182
 	        return $returnVal;
183 183
 	    }
184 184
 
185
-	    if ( $this->source == 'tab' && $this->delimiter == '' ) {
185
+	    if ($this->source == 'tab' && $this->delimiter == '') {
186 186
 	        $this->delimiter = "\t";
187 187
 	    }
188 188
 
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 
228 228
         // Bug 23354 - Make sure enclosure gets saved as an empty string if
229 229
         // it is an empty string, instead of as a null
230
-        if ( strlen($enclosure) <= 0 ) $enclosure = ' ';
230
+        if (strlen($enclosure) <= 0) $enclosure = ' ';
231 231
 
232 232
         $this->assigned_user_id = $owner_id;
233 233
         $this->name             = $name;
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
         parent::save();
243 243
 
244 244
         // Bug 29365 - The enclosure character isn't saved correctly if it's a tab using MssqlManager, so resave it
245
-        if ( $enclosure == '\\t' && $this->db instanceOf MssqlManager ) {
245
+        if ($enclosure == '\\t' && $this->db instanceOf MssqlManager) {
246 246
             $this->enclosure = $enclosure;
247 247
             parent::save();
248 248
         }
@@ -262,11 +262,11 @@  discard block
 block discarded – undo
262 262
     {
263 263
         global $current_user;
264 264
 
265
-        if ( !is_admin($current_user) ) {
265
+        if (!is_admin($current_user)) {
266 266
             $other_map = new ImportMap();
267 267
             $other_map->retrieve_by_string_fields(array('id'=> $id), false);
268 268
 
269
-            if ( $other_map->assigned_user_id != $current_user->id )
269
+            if ($other_map->assigned_user_id != $current_user->id)
270 270
                 return false;
271 271
         }
272 272
 
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
     {
288 288
         global $current_user;
289 289
 
290
-        if ( !is_admin($current_user) )
290
+        if (!is_admin($current_user))
291 291
             return false;
292 292
 
293 293
         // check for problems
@@ -313,16 +313,16 @@  discard block
 block discarded – undo
313 313
         $other_map->retrieve_by_string_fields($query_arr, false);
314 314
 
315 315
         // if we find this other map, quit
316
-        if ( isset($other_map->id) )
316
+        if (isset($other_map->id))
317 317
             return false;
318 318
 
319 319
         // otherwise update the is_published flag
320 320
         $query = "UPDATE $this->table_name
321
-                    SET is_published = '". ($flag?'yes':'no') . "',
321
+                    SET is_published = '".($flag ? 'yes' : 'no')."',
322 322
                         assigned_user_id = '$user_id'
323 323
                     WHERE id = '{$this->id}'";
324 324
 
325
-        $this->db->query($query,true,"Error marking import map published: ");
325
+        $this->db->query($query, true, "Error marking import map published: ");
326 326
 
327 327
         return true;
328 328
     }
@@ -339,21 +339,21 @@  discard block
 block discarded – undo
339 339
     {
340 340
         $query = "SELECT *
341 341
                     FROM {$this->table_name}
342
-                    " . $this->get_where($fields_array);
342
+                    ".$this->get_where($fields_array);
343 343
 
344
-        $result = $this->db->query($query,true," Error: ");
344
+        $result = $this->db->query($query, true, " Error: ");
345 345
         $obj_arr = array();
346 346
 
347
-        while ($row = $this->db->fetchByAssoc($result,FALSE) ) {
347
+        while ($row = $this->db->fetchByAssoc($result, FALSE)) {
348 348
             $focus = new ImportMap();
349 349
 
350
-            foreach($this->column_fields as $field) {
351
-                if(isset($row[$field])) {
350
+            foreach ($this->column_fields as $field) {
351
+                if (isset($row[$field])) {
352 352
                     $focus->$field = $row[$field];
353 353
                 }
354 354
             }
355 355
             $focus->fill_in_additional_detail_fields();
356
-            $obj_arr[]=$focus;
356
+            $obj_arr[] = $focus;
357 357
         }
358 358
 
359 359
         return $obj_arr;
@@ -376,37 +376,37 @@  discard block
 block discarded – undo
376 376
         //step2
377 377
            // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
378 378
          //step3
379
-            'display_tabs_def','custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
379
+            'display_tabs_def', 'custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
380 380
             'importlocale_dateformat', 'importlocale_timeformat', 'importlocale_timezone', 'importlocale_currency',
381 381
             'importlocale_default_currency_significant_digits', 'importlocale_num_grp_sep', 'importlocale_dec_sep',
382 382
         '   importlocale_default_locale_name_format');
383 383
 
384 384
         //retrieve user preferences and populate preference array
385 385
         $preference_values_str = $current_user->getPreference('field_values', 'import');
386
-        $preference_values = json_decode($preference_values_str,true);
386
+        $preference_values = json_decode($preference_values_str, true);
387 387
 
388
-        foreach ($import_step_fields as $val){
388
+        foreach ($import_step_fields as $val) {
389 389
             //overwrite preference array with new values from request if the value is different or new
390
-            if((isset($_REQUEST[$val]) && !isset($preference_values[$val])) || (isset($_REQUEST[$val]) && $preference_values[$val] != $_REQUEST[$val])){
390
+            if ((isset($_REQUEST[$val]) && !isset($preference_values[$val])) || (isset($_REQUEST[$val]) && $preference_values[$val] != $_REQUEST[$val])) {
391 391
                 $preference_values[$val] = $_REQUEST[$val];
392 392
                 $set = true;
393 393
             }
394 394
         }
395 395
 
396 396
         //force the values to passed in array if array is set
397
-        if(!empty($ForceValsArr) && is_array($ForceValsArr)){
398
-            foreach ($ForceValsArr as $forceKey=>$forceVal){
397
+        if (!empty($ForceValsArr) && is_array($ForceValsArr)) {
398
+            foreach ($ForceValsArr as $forceKey=>$forceVal) {
399 399
                 $preference_values[$forceKey] = $forceVal;
400 400
                 $set = true;
401 401
             }
402 402
         }
403 403
 
404 404
         //set preferences if any changes were made and return the new array
405
-        if($set){
406
-            $preference_values_str =  json_encode($preference_values);
405
+        if ($set) {
406
+            $preference_values_str = json_encode($preference_values);
407 407
             $current_user->setPreference('field_values', $preference_values_str, 0, 'import');
408 408
         }
409
-        if(empty($preference_values)){
409
+        if (empty($preference_values)) {
410 410
             return array();
411 411
         }
412 412
 
Please login to merge, or discard this patch.
modules/Import/ImportDuplicateCheck.php 1 patch
Spacing   +63 added lines, -63 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
 /*********************************************************************************
5 5
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     /*
57 57
      * holds current field when a duplicate has been found
58 58
      */
59
-    public $_dupedFields =array();
59
+    public $_dupedFields = array();
60 60
 
61 61
     /**
62 62
      * Constructor
@@ -78,18 +78,18 @@  discard block
 block discarded – undo
78 78
         $indexes = $this->_focus->getIndices();
79 79
 
80 80
         //grab any custom indexes if they exist
81
-        if($this->_focus->hasCustomFields()){
81
+        if ($this->_focus->hasCustomFields()) {
82 82
             $custmIndexes = $this->_focus->db->helper->get_indices($this->_focus->table_name.'_cstm');
83
-            $indexes = array_merge($custmIndexes,$indexes);
83
+            $indexes = array_merge($custmIndexes, $indexes);
84 84
         }
85 85
 
86
-        if ( $this->_focus->getFieldDefinition('email1') )
86
+        if ($this->_focus->getFieldDefinition('email1'))
87 87
             $indexes[] = array(
88 88
                 'name' => 'special_idx_email1',
89 89
                 'type' => 'index',
90 90
                 'fields' => array('email1')
91 91
                 );
92
-        if ( $this->_focus->getFieldDefinition('email2') )
92
+        if ($this->_focus->getFieldDefinition('email2'))
93 93
             $indexes[] = array(
94 94
                 'name' => 'special_idx_email2',
95 95
                 'type' => 'index',
@@ -112,18 +112,18 @@  discard block
 block discarded – undo
112 112
             );
113 113
 
114 114
         $index_array = array();
115
-        foreach ($this->_getIndexVardefs() as $index){
116
-            if ($index['type'] == "index"){
115
+        foreach ($this->_getIndexVardefs() as $index) {
116
+            if ($index['type'] == "index") {
117 117
                 $labelsArray = array();
118
-                foreach ($index['fields'] as $field){
118
+                foreach ($index['fields'] as $field) {
119 119
                     if ($field == 'deleted') continue;
120 120
                     $fieldDef = $this->_focus->getFieldDefinition($field);
121
-                    if ( isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]) )
121
+                    if (isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]))
122 122
                         $labelsArray[$fieldDef['name']] = $super_language_pack[$fieldDef['vname']];
123 123
                     else
124 124
                         $labelsArray[$fieldDef['name']] = $fieldDef['name'];
125 125
                 }
126
-                $index_array[$index['name']] = str_replace(":", "",implode(", ",$labelsArray));
126
+                $index_array[$index['name']] = str_replace(":", "", implode(", ", $labelsArray));
127 127
             }
128 128
         }
129 129
 
@@ -138,21 +138,21 @@  discard block
 block discarded – undo
138 138
      */
139 139
     public function isADuplicateRecordByFields($fieldList)
140 140
     {
141
-        foreach($fieldList as $field)
141
+        foreach ($fieldList as $field)
142 142
         {
143
-            if ( $field == 'email1' || $field == 'email2' )
143
+            if ($field == 'email1' || $field == 'email2')
144 144
             {
145 145
                 $emailAddress = new SugarEmailAddress();
146 146
                 $email = $field;
147
-                if ( $emailAddress->getCountEmailAddressByBean($this->_focus->$email,$this->_focus,($field == 'email1')) > 0 )
147
+                if ($emailAddress->getCountEmailAddressByBean($this->_focus->$email, $this->_focus, ($field == 'email1')) > 0)
148 148
                     return true;
149 149
             }
150 150
             else
151 151
             {
152 152
                 $index_fields = array('deleted' => '0');
153
-                if( is_array($field) )
153
+                if (is_array($field))
154 154
                 {
155
-                    foreach($field as $tmpField)
155
+                    foreach ($field as $tmpField)
156 156
                     {
157 157
                         if ($tmpField == 'deleted')
158 158
                             continue;
@@ -160,16 +160,16 @@  discard block
 block discarded – undo
160 160
                             $index_fields[$tmpField] = $this->_focus->$tmpField;
161 161
                     }
162 162
                 }
163
-                elseif($field != 'deleted' && strlen($this->_focus->$field) > 0)
163
+                elseif ($field != 'deleted' && strlen($this->_focus->$field) > 0)
164 164
                     $index_fields[$field] = $this->_focus->$field;
165 165
 
166
-                if ( count($index_fields) <= 1 )
166
+                if (count($index_fields) <= 1)
167 167
                     continue;
168 168
 
169 169
                 $newfocus = loadBean($this->_focus->module_dir);
170
-                $result = $newfocus->retrieve_by_string_fields($index_fields,true);
170
+                $result = $newfocus->retrieve_by_string_fields($index_fields, true);
171 171
 
172
-                if ( !is_null($result) )
172
+                if (!is_null($result))
173 173
                     return true;
174 174
             }
175 175
         }
@@ -183,15 +183,15 @@  discard block
 block discarded – undo
183 183
      * @param  array $indexlist
184 184
      * @return bool true if this bean is a duplicate or false if it isn't
185 185
      */
186
-    public function isADuplicateRecord( $indexlist )
186
+    public function isADuplicateRecord($indexlist)
187 187
     {
188 188
         // Bug #51264 : Importing updates to rows prevented by duplicates check
189
-        if ( !empty($this->_focus) && ($this->_focus instanceof SugarBean) && !empty($this->_focus->id) )
189
+        if (!empty($this->_focus) && ($this->_focus instanceof SugarBean) && !empty($this->_focus->id))
190 190
         {
191 191
             $_focus = clone $this->_focus;
192 192
             $_focus->id = null;
193 193
             $_focus->retrieve($this->_focus->id);
194
-            if ( !empty($_focus->id) )
194
+            if (!empty($_focus->id))
195 195
             {
196 196
                 return false;
197 197
             }
@@ -200,20 +200,20 @@  discard block
 block discarded – undo
200 200
 
201 201
         //lets strip the indexes of the name field in the value and leave only the index name
202 202
         $origIndexList = $indexlist;
203
-        $indexlist=array();
204
-        $fieldlist=array();
205
-        $customIndexlist=array();
206
-        foreach($origIndexList as $iv){
207
-            if(empty($iv)) continue;
208
-            $field_index_array = explode('::',$iv);
209
-            if($field_index_array[0] == 'customfield'){
203
+        $indexlist = array();
204
+        $fieldlist = array();
205
+        $customIndexlist = array();
206
+        foreach ($origIndexList as $iv) {
207
+            if (empty($iv)) continue;
208
+            $field_index_array = explode('::', $iv);
209
+            if ($field_index_array[0] == 'customfield') {
210 210
                 //this is a custom field, so place in custom array
211 211
                 $customIndexlist[] = $field_index_array[1];
212 212
 
213
-            }else{
213
+            } else {
214 214
                 //this is not a custom field, so place in index list
215 215
                 $indexlist[] = $field_index_array[0];
216
-                if(isset($field_index_array[1])) {
216
+                if (isset($field_index_array[1])) {
217 217
                     $fieldlist[] = $field_index_array[1];
218 218
                 }
219 219
             }
@@ -221,11 +221,11 @@  discard block
 block discarded – undo
221 221
 
222 222
         //if full_name is set, then manually search on the first and last name fields before iterating through rest of fields
223 223
         //this is a special handling of the name fields on people objects, the rest of the fields are checked individually
224
-        if(in_array('full_name',$indexlist)){
224
+        if (in_array('full_name', $indexlist)) {
225 225
             $newfocus = loadBean($this->_focus->module_dir);
226
-            $result = $newfocus->retrieve_by_string_fields(array('deleted' =>'0', 'first_name'=>$this->_focus->first_name, 'last_name'=>$this->_focus->last_name),true);
226
+            $result = $newfocus->retrieve_by_string_fields(array('deleted' =>'0', 'first_name'=>$this->_focus->first_name, 'last_name'=>$this->_focus->last_name), true);
227 227
 
228
-            if ( !is_null($result) ){
228
+            if (!is_null($result)) {
229 229
                 //set dupe field to full_name and name fields
230 230
                 $this->_dupedFields[] = 'full_name';
231 231
                 $this->_dupedFields[] = 'first_name';
@@ -235,61 +235,61 @@  discard block
 block discarded – undo
235 235
         }
236 236
 
237 237
         // loop through var def indexes and compare with selected indexes
238
-        foreach ($this->_getIndexVardefs() as $index){
238
+        foreach ($this->_getIndexVardefs() as $index) {
239 239
             // if we get an index not in the indexlist, loop
240
-            if ( !in_array($index['name'],$indexlist) )
240
+            if (!in_array($index['name'], $indexlist))
241 241
                 continue;
242 242
 
243 243
             // This handles the special case of duplicate email checking
244
-            if ( $index['name'] == 'special_idx_email1' || $index['name'] == 'special_idx_email2' ) {
244
+            if ($index['name'] == 'special_idx_email1' || $index['name'] == 'special_idx_email2') {
245 245
                 $emailAddress = new SugarEmailAddress();
246 246
                 $email = $index['fields'][0];
247
-                if ( $emailAddress->getCountEmailAddressByBean(
247
+                if ($emailAddress->getCountEmailAddressByBean(
248 248
                         $this->_focus->$email,
249 249
                         $this->_focus,
250 250
                         ($index['name'] == 'special_idx_email1')
251
-                        ) > 0 ){ foreach($index['fields'] as $field){
252
-                        if($field !='deleted')
251
+                        ) > 0) { foreach ($index['fields'] as $field) {
252
+                        if ($field != 'deleted')
253 253
                             $this->_dupedFields[] = $field;
254 254
                     }
255 255
                 }
256 256
             }
257 257
             // Adds a hook so you can define a method in the bean to handle dupe checking
258
-            elseif ( isset($index['dupeCheckFunction']) ) {
259
-                $functionName = substr_replace($index['dupeCheckFunction'],'',0,9);
260
-                if ( method_exists($this->_focus,$functionName) && $this->_focus->$functionName($index) === true)
258
+            elseif (isset($index['dupeCheckFunction'])) {
259
+                $functionName = substr_replace($index['dupeCheckFunction'], '', 0, 9);
260
+                if (method_exists($this->_focus, $functionName) && $this->_focus->$functionName($index) === true)
261 261
                     return $this->_focus->$functionName($index);
262 262
             }
263 263
             else {
264 264
                 $index_fields = array('deleted' => '0');
265 265
                 //search only for the field we have selected
266
-                foreach($index['fields'] as $field){
267
-                    if ($field == 'deleted' ||  !in_array($field,$fieldlist))
266
+                foreach ($index['fields'] as $field) {
267
+                    if ($field == 'deleted' || !in_array($field, $fieldlist))
268 268
                         continue;
269
-                    if (!in_array($field,$index_fields))
269
+                    if (!in_array($field, $index_fields))
270 270
                         if (isset($this->_focus->$field) && strlen($this->_focus->$field) > 0)
271 271
                             $index_fields[$field] = $this->_focus->$field;
272 272
                 }
273 273
 
274 274
                 // if there are no valid fields in the index field list, loop
275
-                if ( count($index_fields) <= 1 )
275
+                if (count($index_fields) <= 1)
276 276
                     continue;
277 277
 
278 278
                 $newfocus = loadBean($this->_focus->module_dir);
279
-                $result = $newfocus->retrieve_by_string_fields($index_fields,true);
279
+                $result = $newfocus->retrieve_by_string_fields($index_fields, true);
280 280
 
281
-                if ( !is_null($result) ){
281
+                if (!is_null($result)) {
282 282
                     //remove deleted as a duped field
283 283
                     unset($index_fields['deleted']);
284 284
 
285 285
                     //create string based on array of dupe fields
286
-                    $this->_dupedFields = array_merge(array_keys($index_fields),$this->_dupedFields);
286
+                    $this->_dupedFields = array_merge(array_keys($index_fields), $this->_dupedFields);
287 287
                 }
288 288
             }
289 289
         }
290 290
 
291 291
         //return true if any dupes were found
292
-        if(!empty($this->_dupedFields)){
292
+        if (!empty($this->_dupedFields)) {
293 293
             return true;
294 294
         }
295 295
 
@@ -301,33 +301,33 @@  discard block
 block discarded – undo
301 301
     {
302 302
         require_once('include/export_utils.php');
303 303
         $import_fields = $this->_focus->get_importable_fields();
304
-        $importable_keys = array_keys($import_fields);//
304
+        $importable_keys = array_keys($import_fields); //
305 305
 
306 306
         $index_array = array();
307 307
         $fields_used = array();
308
-        $mstr_exclude_array = array('all'=>array('team_set_id','id','deleted'),'contacts'=>array('email2'), array('leads'=>'reports_to_id'), array('prospects'=>'tracker_key'));
308
+        $mstr_exclude_array = array('all'=>array('team_set_id', 'id', 'deleted'), 'contacts'=>array('email2'), array('leads'=>'reports_to_id'), array('prospects'=>'tracker_key'));
309 309
 
310 310
         //create exclude array from subset of applicable mstr_exclude_array elements
311
-        $exclude_array =  isset($mstr_exclude_array[strtolower($this->_focus->module_dir)])?array_merge($mstr_exclude_array[strtolower($this->_focus->module_dir)], $mstr_exclude_array['all']) : $mstr_exclude_array['all'];
311
+        $exclude_array = isset($mstr_exclude_array[strtolower($this->_focus->module_dir)]) ? array_merge($mstr_exclude_array[strtolower($this->_focus->module_dir)], $mstr_exclude_array['all']) : $mstr_exclude_array['all'];
312 312
 
313 313
 
314 314
 
315 315
         //process all fields belonging to indexes
316
-        foreach ($this->_getIndexVardefs() as $index){
317
-            if ($index['type'] == "index"){
316
+        foreach ($this->_getIndexVardefs() as $index) {
317
+            if ($index['type'] == "index") {
318 318
 
319
-                foreach ($index['fields'] as $field){
320
-                    $fieldName='';
319
+                foreach ($index['fields'] as $field) {
320
+                    $fieldName = '';
321 321
 
322 322
                     //skip this field if it is the deleted field, not in the importable keys array, or a field in the exclude array
323 323
                     if (!in_array($field, $importable_keys) || in_array($field, $exclude_array)) continue;
324 324
                     $fieldDef = $this->_focus->getFieldDefinition($field);
325 325
 
326 326
                     //skip if this field is already defined (from another index)
327
-                    if (in_array($fieldDef['name'],$fields_used)) continue;
327
+                    if (in_array($fieldDef['name'], $fields_used)) continue;
328 328
 
329 329
                     //get the proper export label
330
-                    $fieldName = translateForExport($fieldDef['name'],$this->_focus);
330
+                    $fieldName = translateForExport($fieldDef['name'], $this->_focus);
331 331
 
332 332
 
333 333
                     $index_array[$index['name'].'::'.$fieldDef['name']] = $fieldName;
@@ -338,9 +338,9 @@  discard block
 block discarded – undo
338 338
         }
339 339
 
340 340
         //special handling for beans with first_name and last_name
341
-        if(in_array('first_name', $fields_used) && in_array('last_name', $fields_used)){
341
+        if (in_array('first_name', $fields_used) && in_array('last_name', $fields_used)) {
342 342
             //since both full name and last name fields have been mapped, add full name index
343
-            $index_array['full_name::full_name'] = translateForExport('full_name',$this->_focus);
343
+            $index_array['full_name::full_name'] = translateForExport('full_name', $this->_focus);
344 344
             $fields_used[] = 'full_name';
345 345
         }
346 346
 
Please login to merge, or discard this patch.
modules/Cases/vardefs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -245,7 +245,7 @@
 block discarded – undo
245 245
             array(
246 246
                 'name' => 'emails',
247 247
                 'type' => 'link',
248
-                'relationship' => 'emails_cases_rel',/* reldef in emails */
248
+                'relationship' => 'emails_cases_rel', /* reldef in emails */
249 249
                 'source' => 'non-db',
250 250
                 'vname' => 'LBL_EMAILS',
251 251
             ),
Please login to merge, or discard this patch.
modules/Cases/metadata/accountsquickcreatedefs.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 
40 40
 $viewdefs['Cases']['AccountsQuickCreate'] = array(
41 41
 'templateMeta' => array('form' => 
42
-                            array (
42
+                            array(
43 43
                               'hidden' => 
44
-                              array (
44
+                              array(
45 45
                                 0 => '<input type="hidden" name="account_id" value="{$smarty.request.account_id}">',
46 46
                                 1 => '<input type="hidden" name="account_name" value="{$smarty.request.account_name}">',
47 47
                               ),
@@ -54,22 +54,22 @@  discard block
 block discarded – undo
54 54
                        ),
55 55
 'panels' =>
56 56
 
57
-array (
57
+array(
58 58
   
59
-  array (
60
-    array ('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
59
+  array(
60
+    array('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
61 61
     'priority'
62 62
   ),
63 63
   
64
-  array (
64
+  array(
65 65
     'status',
66 66
     array('name'=>'account_name', 'type'=>'readonly'),
67 67
   ),
68 68
   
69
-  array (
70
-    array (
69
+  array(
70
+    array(
71 71
       'name' => 'description',
72
-      'displayParams' => array ('rows' => '4','cols' => '60'),
72
+      'displayParams' => array('rows' => '4', 'cols' => '60'),
73 73
       'nl2br' => true,
74 74
     ),
75 75
   ),
Please login to merge, or discard this patch.