Completed
Push — console-installer ( 3d54e5...e2b50d )
by Adam
69:10 queued 48:24
created
modules/AOR_Reports/views/view.edit.php 1 patch
Braces   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -94,8 +94,7 @@  discard block
 block discarded – undo
94 94
             }
95 95
             if(isset($conditions[$condition_item['condition_order']])) {
96 96
                 $conditions[] = $condition_item;
97
-            }
98
-            else {
97
+            } else {
99 98
                 $conditions[$condition_item['condition_order']] = $condition_item;
100 99
             }
101 100
         }
@@ -144,7 +143,7 @@  discard block
 block discarded – undo
144 143
         $modulePathDisplay[] = $currentBean->module_name;
145 144
         if(is_array($modulePath)) {
146 145
             $split = $modulePath;
147
-        }else{
146
+        } else{
148 147
             $split = explode(':', $modulePath);
149 148
         }
150 149
         if ($split && $split[0] == $currentBean->module_dir) {
@@ -162,7 +161,7 @@  discard block
 block discarded – undo
162 161
 
163 162
             if(!empty($moduleLabel)){
164 163
                 $modulePathDisplay[] = $moduleLabel;
165
-            }else {
164
+            } else {
166 165
                 $modulePathDisplay[] = $currentBean->module_name;
167 166
             }
168 167
         }
Please login to merge, or discard this patch.
modules/AOR_Reports/views/view.detail.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,8 +55,7 @@
 block discarded – undo
55 55
             }
56 56
             if(isset($parameters[$condition_item['condition_order']])) {
57 57
                 $parameters[] = $condition_item;
58
-            }
59
-            else {
58
+            } else {
60 59
                 $parameters[$condition_item['condition_order']] = $condition_item;
61 60
             }
62 61
         }
Please login to merge, or discard this patch.
modules/AOR_Reports/controller.php 1 patch
Braces   +110 added lines, -51 removed lines patch added patch discarded remove patch
@@ -191,10 +191,11 @@  discard block
 block discarded – undo
191 191
 
192 192
             for($x =0; $x < $countOfCharts; $x++)
193 193
             {
194
-                if(is_null($itemsWithModulus) ||  $x < $itemsWithModulus)
195
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$width%;' />";
196
-                else
197
-                    $graphHtml.="<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
194
+                if(is_null($itemsWithModulus) ||  $x < $itemsWithModulus) {
195
+                                    $graphHtml.="<img src='.$graphs[$x].' style='width:$width%;' />";
196
+                } else {
197
+                                    $graphHtml.="<img src='.$graphs[$x].' style='width:$modulusWidth%;' />";
198
+                }
198 199
             }
199 200
 
200 201
 /*            foreach($graphs as $g)
@@ -241,7 +242,7 @@  discard block
 block discarded – undo
241 242
             $pdf->WriteHTML($printable,3);
242 243
             $pdf->Output($this->bean->name.'.pdf', "D");
243 244
 
244
-        }catch(mPDF_exception $e){
245
+        } catch(mPDF_exception $e){
245 246
             echo $e;
246 247
         }
247 248
 
@@ -259,7 +260,7 @@  discard block
 block discarded – undo
259 260
 
260 261
         if($view == 'EditView'){
261 262
             echo "<select type='text' style='width:100px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_function_list'], $value) ."</select>";
262
-        }else{
263
+        } else{
263 264
             echo $app_list_strings['aor_function_list'][$value];
264 265
         }
265 266
         die;
@@ -278,11 +279,17 @@  discard block
 block discarded – undo
278 279
         $fieldname = $_REQUEST['aor_fieldname'];
279 280
         $aor_field = $_REQUEST['aor_newfieldname'];
280 281
 
281
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
282
-        else $view= 'EditView';
282
+        if(isset($_REQUEST['view'])) {
283
+            $view = $_REQUEST['view'];
284
+        } else {
285
+            $view= 'EditView';
286
+        }
283 287
 
284
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
285
-        else $value = '';
288
+        if(isset($_REQUEST['aor_value'])) {
289
+            $value = $_REQUEST['aor_value'];
290
+        } else {
291
+            $value = '';
292
+        }
286 293
 
287 294
 
288 295
         require_once($beanFiles[$beanList[$module]]);
@@ -329,7 +336,7 @@  discard block
 block discarded – undo
329 336
         $app_list_strings['aor_operator_list'];
330 337
         if($view == 'EditView'){
331 338
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_operator_list'], $value) ."</select>";
332
-        }else{
339
+        } else{
333 340
             echo $app_list_strings['aor_operator_list'][$value];
334 341
         }
335 342
         die;
@@ -348,11 +355,17 @@  discard block
 block discarded – undo
348 355
         $fieldname = $_REQUEST['aor_fieldname'];
349 356
         $aor_field = $_REQUEST['aor_newfieldname'];
350 357
 
351
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
352
-        else $view= 'EditView';
358
+        if(isset($_REQUEST['view'])) {
359
+            $view = $_REQUEST['view'];
360
+        } else {
361
+            $view= 'EditView';
362
+        }
353 363
 
354
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
355
-        else $value = '';
364
+        if(isset($_REQUEST['aor_value'])) {
365
+            $value = $_REQUEST['aor_value'];
366
+        } else {
367
+            $value = '';
368
+        }
356 369
 
357 370
 
358 371
         require_once($beanFiles[$beanList[$module]]);
@@ -403,7 +416,7 @@  discard block
 block discarded – undo
403 416
 
404 417
         if($view == 'EditView'){
405 418
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_condition_type_list'], $value) ."</select>";
406
-        }else{
419
+        } else{
407 420
             echo $app_list_strings['aor_condition_type_list'][$value];
408 421
         }
409 422
         die;
@@ -423,11 +436,17 @@  discard block
 block discarded – undo
423 436
         $fieldname = $_REQUEST['aor_fieldname'];
424 437
         $aor_field = $_REQUEST['aor_newfieldname'];
425 438
 
426
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
427
-        else $view= 'EditView';
439
+        if(isset($_REQUEST['view'])) {
440
+            $view = $_REQUEST['view'];
441
+        } else {
442
+            $view= 'EditView';
443
+        }
428 444
 
429
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
430
-        else $value = '';
445
+        if(isset($_REQUEST['aor_value'])) {
446
+            $value = $_REQUEST['aor_value'];
447
+        } else {
448
+            $value = '';
449
+        }
431 450
 
432 451
 
433 452
         require_once($beanFiles[$beanList[$module]]);
@@ -460,7 +479,9 @@  discard block
 block discarded – undo
460 479
                 break;
461 480
             case 'relate':
462 481
                 $valid_opp = array('Value','Field');
463
-                if($vardef['module'] == 'Users') $valid_opp = array('Value','Field','Round_Robin','Least_Busy','Random');
482
+                if($vardef['module'] == 'Users') {
483
+                    $valid_opp = array('Value','Field','Round_Robin','Least_Busy','Random');
484
+                }
464 485
                 break;
465 486
             default:
466 487
                 $valid_opp = array('Value','Field');
@@ -475,7 +496,7 @@  discard block
 block discarded – undo
475 496
 
476 497
         if($view == 'EditView'){
477 498
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_action_type_list'], $value) ."</select>";
478
-        }else{
499
+        } else{
479 500
             echo $app_list_strings['aor_action_type_list'][$value];
480 501
         }
481 502
         die;
@@ -494,18 +515,26 @@  discard block
 block discarded – undo
494 515
         $fieldname = $_REQUEST['aor_fieldname'];
495 516
         $aor_field = $_REQUEST['aor_newfieldname'];
496 517
 
497
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
498
-        else $view= 'EditView';
518
+        if(isset($_REQUEST['view'])) {
519
+            $view = $_REQUEST['view'];
520
+        } else {
521
+            $view= 'EditView';
522
+        }
499 523
 
500
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
501
-        else $value = '';
524
+        if(isset($_REQUEST['aor_value'])) {
525
+            $value = $_REQUEST['aor_value'];
526
+        } else {
527
+            $value = '';
528
+        }
502 529
 
503 530
         switch($_REQUEST['aor_type']) {
504 531
             case 'Field':
505
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
532
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
533
+                    $module = $_REQUEST['alt_module'];
534
+                }
506 535
                 if($view == 'EditView'){
507 536
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
508
-                }else{
537
+                } else{
509 538
                     echo getModuleFields($module, $view, $value);
510 539
                 }
511 540
                 break;
@@ -518,7 +547,7 @@  discard block
 block discarded – undo
518 547
             case 'Period':
519 548
                 if($view == 'EditView'){
520 549
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getDropdownList('date_time_period_list',$_REQUEST['aor_value']) ."</select>";
521
-                }else{
550
+                } else{
522 551
                     echo getDropdownList('date_time_period_list',$_REQUEST['aor_value']);
523 552
                 }
524 553
 
@@ -540,23 +569,33 @@  discard block
 block discarded – undo
540 569
         $fieldname = $_REQUEST['aor_fieldname'];
541 570
         $aor_field = $_REQUEST['aor_newfieldname'];
542 571
 
543
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
544
-        else $view= 'EditView';
572
+        if(isset($_REQUEST['view'])) {
573
+            $view = $_REQUEST['view'];
574
+        } else {
575
+            $view= 'EditView';
576
+        }
545 577
 
546
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
547
-        else $value = '';
578
+        if(isset($_REQUEST['aor_value'])) {
579
+            $value = $_REQUEST['aor_value'];
580
+        } else {
581
+            $value = '';
582
+        }
548 583
 
549 584
         switch($_REQUEST['aor_type']) {
550 585
             case 'Field':
551
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
586
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
587
+                    $module = $_REQUEST['alt_module'];
588
+                }
552 589
                 if($view == 'EditView'){
553 590
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
554
-                }else{
591
+                } else{
555 592
                     echo getModuleFields($module, $view, $value);
556 593
                 }
557 594
                 break;
558 595
             case 'Date':
559
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
596
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
597
+                    $module = $_REQUEST['alt_module'];
598
+                }
560 599
                 echo getDateField($module, $aor_field, $view, $value);
561 600
                 break;
562 601
             Case 'Round_Robin';
@@ -575,11 +614,17 @@  discard block
 block discarded – undo
575 614
 
576 615
     protected function action_getModuleField()
577 616
     {
578
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
579
-        else $view= 'EditView';
617
+        if(isset($_REQUEST['view'])) {
618
+            $view = $_REQUEST['view'];
619
+        } else {
620
+            $view= 'EditView';
621
+        }
580 622
 
581
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
582
-        else $value = '';
623
+        if(isset($_REQUEST['aor_value'])) {
624
+            $value = $_REQUEST['aor_value'];
625
+        } else {
626
+            $value = '';
627
+        }
583 628
 
584 629
         echo getModuleField($_REQUEST['aor_module'],$_REQUEST['aor_fieldname'], $_REQUEST['aor_newfieldname'], $view, $value );
585 630
         die;
@@ -591,18 +636,26 @@  discard block
 block discarded – undo
591 636
         $fieldname = $_REQUEST['aor_fieldname'];
592 637
         $aor_field = $_REQUEST['aor_newfieldname'];
593 638
 
594
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
595
-        else $view= 'EditView';
639
+        if(isset($_REQUEST['view'])) {
640
+            $view = $_REQUEST['view'];
641
+        } else {
642
+            $view= 'EditView';
643
+        }
596 644
 
597
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
598
-        else $value = '';
645
+        if(isset($_REQUEST['aor_value'])) {
646
+            $value = $_REQUEST['aor_value'];
647
+        } else {
648
+            $value = '';
649
+        }
599 650
 
600 651
         switch($_REQUEST['aor_type']) {
601 652
             case 'Field':
602
-                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') $module = $_REQUEST['alt_module'];
653
+                if(isset($_REQUEST['alt_module']) && $_REQUEST['alt_module'] != '') {
654
+                    $module = $_REQUEST['alt_module'];
655
+                }
603 656
                 if($view == 'EditView'){
604 657
                     echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". getModuleFields($module, $view, $value) ."</select>";
605
-                }else{
658
+                } else{
606 659
                     echo getModuleFields($module, $view, $value);
607 660
                 }
608 661
                 break;
@@ -624,11 +677,17 @@  discard block
 block discarded – undo
624 677
         $fieldname = $_REQUEST['aor_fieldname'];
625 678
         $aor_field = $_REQUEST['aor_newfieldname'];
626 679
 
627
-        if(isset($_REQUEST['view'])) $view = $_REQUEST['view'];
628
-        else $view= 'EditView';
680
+        if(isset($_REQUEST['view'])) {
681
+            $view = $_REQUEST['view'];
682
+        } else {
683
+            $view= 'EditView';
684
+        }
629 685
 
630
-        if(isset($_REQUEST['aor_value'])) $value = $_REQUEST['aor_value'];
631
-        else $value = '';
686
+        if(isset($_REQUEST['aor_value'])) {
687
+            $value = $_REQUEST['aor_value'];
688
+        } else {
689
+            $value = '';
690
+        }
632 691
 
633 692
 
634 693
         require_once($beanFiles[$beanList[$module]]);
@@ -652,7 +711,7 @@  discard block
 block discarded – undo
652 711
 
653 712
         if($view == 'EditView'){
654 713
             echo "<select type='text' style='width:178px;' name='$aor_field' id='$aor_field' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aor_rel_action_type_list'], $value) ."</select>";
655
-        }else{
714
+        } else{
656 715
             echo $app_list_strings['aor_rel_action_type_list'][$value];
657 716
         }
658 717
         die;
Please login to merge, or discard this patch.
modules/DynamicFields/UpgradeFields.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); 
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -89,15 +91,19 @@  discard block
 block discarded – undo
89 91
 			$the_field->set($fieldDef);
90 92
 				
91 93
 				if(!isset($fields[$col]) && $col != 'id_c'){
92
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
94
+					if(!$simulate) {
95
+					    $db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
96
+					}
93 97
 					unset($fields[$col]);
94 98
 					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
95
-				}	else{
99
+				} else{
96 100
 					if($col != 'id_c'){
97 101
 					if(trim($the_field->get_db_type()) != trim($type)){
98 102
 						
99 103
 					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
100
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
104
+					if(!$simulate) {
105
+					    $db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));
106
+					}
101 107
 					}
102 108
 					}
103 109
 					
Please login to merge, or discard this patch.
modules/SecurityGroups/AssignGroups.php 1 patch
Braces   +13 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 
4 6
 
5 7
 class AssignGroups {
@@ -14,7 +16,9 @@  discard block
 block discarded – undo
14 16
 		&& empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") {		
15 17
 		//Upload an attachment to an Email Template and save. If user with multi groups - popup select option
16 18
 		//it will redirect to notes instead of EmailTemplate and relationship will fail...check below to avoid
17
-		if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) return;
19
+		if(!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) {
20
+		    return;
21
+		}
18 22
 
19 23
 		if(!empty($_REQUEST['securitygroup_list'])) {
20 24
 			require_once('modules/SecurityGroups/SecurityGroup.php');
@@ -38,9 +42,7 @@  discard block
 block discarded – undo
38 42
 			unset($_SESSION['securitysuite_error']); //to be safe
39 43
 			$_SESSION['securitysuite_error'] = $ss_mod_strings['LBL_ERROR_DUPLICATE'];
40 44
 		}
41
-	}
42
-
43
-	else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
45
+	} else if(isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true
44 46
 		&& empty($bean->fetched_row['id']) && $bean->module_dir == "Users"
45 47
 		&& isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature' ) { //Bug: 589
46 48
 
@@ -63,7 +65,9 @@  discard block
 block discarded – undo
63 65
 
64 66
 function popup_onload($event, $arguments)
65 67
 {
66
-	if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) return;
68
+	if(!empty($_REQUEST['to_pdf']) || !empty($_REQUEST['sugar_body_only'])) {
69
+	    return;
70
+	}
67 71
 
68 72
 /** //test user popup
69 73
 	//always have this loaded
@@ -74,7 +78,9 @@  discard block
 block discarded – undo
74 78
 	$module = $_REQUEST['module'];
75 79
 	$action = $_REQUEST['action'];
76 80
 
77
-	if(isset($action) && ($action == "Save" || $action == "SetTimezone")) return;  
81
+	if(isset($action) && ($action == "Save" || $action == "SetTimezone")) {
82
+	    return;
83
+	}
78 84
 
79 85
 	if( (
80 86
 			//(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true)
Please login to merge, or discard this patch.
modules/Contacts/disablePortalUser.php 1 patch
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,7 +21,9 @@  discard block
 block discarded – undo
21 21
  *
22 22
  * @author Salesagility Ltd <[email protected]>
23 23
  */
24
-if(!defined('sugarEntry'))define('sugarEntry', true);
24
+if(!defined('sugarEntry')) {
25
+    define('sugarEntry', true);
26
+}
25 27
 require_once 'modules/AOP_Case_Updates/util.php';
26 28
 if(!isAOPEnabled()){
27 29
     return;
@@ -40,12 +42,12 @@  discard block
 block discarded – undo
40 42
     if(!$res->success){
41 43
         $msg = $res->error ? $res->error : $mod_strings['LBL_DISABLE_PORTAL_USER_FAILED'];
42 44
         SugarApplication::appendErrorMessage($msg);
43
-    }else{
45
+    } else{
44 46
         $bean->portal_account_disabled = 1;
45 47
         $bean->save(false);
46 48
         SugarApplication::appendErrorMessage($mod_strings['LBL_DISABLE_PORTAL_USER_SUCCESS']);
47 49
     }
48
-}else{
50
+} else{
49 51
     SugarApplication::appendErrorMessage($mod_strings['LBL_NO_JOOMLA_URL']);
50 52
 }
51 53
 
Please login to merge, or discard this patch.
modules/Contacts/metadata/additionalDetails.php 1 patch
Braces   +45 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,26 +58,52 @@  discard block
 block discarded – undo
56 58
 
57 59
     if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
58 60
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
59
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
60
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
61
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
62
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
63
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
64
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
65
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
66
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
67
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
68
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
69
-		$overlib_string .= '<br>';  
70
-	if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
71
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
72
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
61
+		!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
62
+    			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
63
+    }
64
+	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) {
65
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
66
+	}
67
+	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) {
68
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
69
+	}
70
+	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) {
71
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
72
+	}
73
+	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) {
74
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
75
+	}
76
+	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) {
77
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
78
+	}
79
+	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) {
80
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
81
+	}
82
+	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
83
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
84
+	}
85
+	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) {
86
+			$overlib_string .= '<br>';
87
+	}
88
+	if(!empty($fields['PHONE_MOBILE'])) {
89
+	    $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
90
+	}
91
+	if(!empty($fields['PHONE_HOME'])) {
92
+	    $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
93
+	}
94
+	if(!empty($fields['PHONE_OTHER'])) {
95
+	    $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
96
+	}
73 97
 
74
-	if(!empty($fields['DATE_MODIFIED'])) $overlib_string .= '<b>'. $mod_strings['LBL_DATE_MODIFIED'] . '</b> ' . $fields['DATE_MODIFIED'] . '<br>';
98
+	if(!empty($fields['DATE_MODIFIED'])) {
99
+	    $overlib_string .= '<b>'. $mod_strings['LBL_DATE_MODIFIED'] . '</b> ' . $fields['DATE_MODIFIED'] . '<br>';
100
+	}
75 101
 	
76 102
 	if(!empty($fields['DESCRIPTION'])) { 
77 103
 		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
78
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
104
+		if(strlen($fields['DESCRIPTION']) > 300) {
105
+		    $overlib_string .= '...';
106
+		}
79 107
 	}	
80 108
 	
81 109
 	return array('fieldToAddTo' => 'NAME', 
Please login to merge, or discard this patch.
modules/Contacts/views/view.quickcreate.php 1 patch
Braces   +21 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,6 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 //FILE SUGARCRM flav=pro || flav=sales
3
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3
+if(!defined('sugarEntry') || !sugarEntry) {
4
+    die('Not A Valid Entry Point');
5
+}
4 6
 /*********************************************************************************
5 7
  * SugarCRM Community Edition is a customer relationship management program developed by
6 8
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -51,12 +53,24 @@  discard block
 block discarded – undo
51 53
     		//XXX TODO 20110329 Frank Steegmans: Hack to make quick create fields populate when used through the DC menu
52 54
     		//          NOTE HOWEVER that sqs_objects form fields are not properly populated because of some other hacks
53 55
     		//          resulting in none of the fields properly populating when selecting an account
54
-    		if(!empty($this->bean->phone_office))$_REQUEST['phone_work'] = $this->bean->phone_office;
55
-    		if(!empty($this->bean->billing_address_street))$_REQUEST['primary_address_street'] = $this->bean->billing_address_street;
56
-    		if(!empty($this->bean->billing_address_city))$_REQUEST['primary_address_city'] = $this->bean->billing_address_city;
57
-    		if(!empty($this->bean->billing_address_state))$_REQUEST['primary_address_state'] = $this->bean->billing_address_state;
58
-    		if(!empty($this->bean->billing_address_country))$_REQUEST['primary_address_country'] = $this->bean->billing_address_country;
59
-    		if(!empty($this->bean->billing_address_postalcode))$_REQUEST['primary_address_postalcode'] = $this->bean->billing_address_postalcode;
56
+    		if(!empty($this->bean->phone_office)) {
57
+    		    $_REQUEST['phone_work'] = $this->bean->phone_office;
58
+    		}
59
+    		if(!empty($this->bean->billing_address_street)) {
60
+    		    $_REQUEST['primary_address_street'] = $this->bean->billing_address_street;
61
+    		}
62
+    		if(!empty($this->bean->billing_address_city)) {
63
+    		    $_REQUEST['primary_address_city'] = $this->bean->billing_address_city;
64
+    		}
65
+    		if(!empty($this->bean->billing_address_state)) {
66
+    		    $_REQUEST['primary_address_state'] = $this->bean->billing_address_state;
67
+    		}
68
+    		if(!empty($this->bean->billing_address_country)) {
69
+    		    $_REQUEST['primary_address_country'] = $this->bean->billing_address_country;
70
+    		}
71
+    		if(!empty($this->bean->billing_address_postalcode)) {
72
+    		    $_REQUEST['primary_address_postalcode'] = $this->bean->billing_address_postalcode;
73
+    		}
60 74
 	   	}
61 75
     }    
62 76
 }
63 77
\ No newline at end of file
Please login to merge, or discard this patch.
modules/Contacts/views/view.closecontactaddresspopup.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,9 @@
 block discarded – undo
47 47
  	}
48 48
 
49 49
  	function display() {
50
-        if(isset($_REQUEST['close_window'])) echo "<script>window.close();</script>";
50
+        if(isset($_REQUEST['close_window'])) {
51
+            echo "<script>window.close();</script>";
52
+        }
51 53
         parent::display();
52 54
  	}	
53 55
 }
Please login to merge, or discard this patch.