Completed
Push — develop ( edae1e...431cf5 )
by Adam
20:48
created
modules/Contacts/metadata/quickcreatedefs.php 3 patches
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -45,16 +45,16 @@  discard block
 block discarded – undo
45 45
  * Contributor(s): ______________________________________..
46 46
  ********************************************************************************/
47 47
 $viewdefs = array (
48
-  'Contacts' => 
49
-  array (
48
+    'Contacts' => 
49
+    array (
50 50
     'QuickCreate' => 
51 51
     array (
52
-      'templateMeta' => 
53
-      array (
52
+        'templateMeta' => 
53
+        array (
54 54
         'form' => 
55 55
         array (
56
-          'hidden' => 
57
-          array (
56
+            'hidden' => 
57
+            array (
58 58
             '<input type="hidden" name="opportunity_id" value="{$smarty.request.opportunity_id}">',
59 59
             '<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
60 60
             '<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
@@ -62,91 +62,91 @@  discard block
 block discarded – undo
62 62
             '<input type="hidden" name="inbound_email_id" value="{$smarty.request.inbound_email_id}">',
63 63
             '{if !empty($smarty.request.contact_id)}<input type="hidden" name="reports_to_id" value="{$smarty.request.contact_id}">{/if}',
64 64
             '{if !empty($smarty.request.contact_name)}<input type="hidden" name="report_to_name" value="{$smarty.request.contact_name}">{/if}',
65
-          ),
65
+            ),
66 66
         ),
67 67
         'maxColumns' => '2',
68 68
         'widths' => 
69 69
         array (
70
-          array (
70
+            array (
71 71
             'label' => '10',
72 72
             'field' => '30',
73
-          ),
74
-          array (
73
+            ),
74
+            array (
75 75
             'label' => '10',
76 76
             'field' => '30',
77
-          ),
77
+            ),
78
+        ),
78 79
         ),
79
-      ),
80
-      'panels' => 
81
-      array (
80
+        'panels' => 
81
+        array (
82 82
         'default' => 
83 83
         array (
84 84
 
85
-          array (
85
+            array (
86 86
 
87 87
             array (
88
-              'name' => 'first_name',
88
+                'name' => 'first_name',
89 89
                 'customCode' => '{html_options name="salutation" id="salutation" options=$fields.salutation.options selected=$fields.salutation.value}'
90 90
                 . '&nbsp;<input name="first_name" id="first_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
91 91
             ),
92 92
 
93 93
             array (
94
-              'name' => 'account_name',
94
+                'name' => 'account_name',
95
+            ),
95 96
             ),
96
-          ),
97 97
 
98
-          array (
98
+            array (
99 99
 
100 100
             array (
101
-              'name' => 'last_name',
102
-              'displayParams'=>array('required'=>true),
101
+                'name' => 'last_name',
102
+                'displayParams'=>array('required'=>true),
103 103
             ),
104 104
 
105 105
             array (
106
-              'name' => 'phone_work',
106
+                'name' => 'phone_work',
107
+            ),
107 108
             ),
108
-          ),
109 109
 
110
-          array (
110
+            array (
111 111
 
112 112
             array (
113
-              'name' => 'title',
113
+                'name' => 'title',
114 114
             ),
115 115
 
116 116
             array (
117
-              'name' => 'phone_mobile',
117
+                'name' => 'phone_mobile',
118
+            ),
118 119
             ),
119
-          ),
120 120
 
121
-          array (
121
+            array (
122 122
 
123 123
             array (
124
-              'name' => 'phone_fax',
124
+                'name' => 'phone_fax',
125 125
             ),
126 126
 
127 127
             array (
128
-              'name' => 'do_not_call',
128
+                'name' => 'do_not_call',
129
+            ),
129 130
             ),
130
-          ),
131 131
 
132
-          array (
133 132
             array (
134
-              'name' => 'email1',
133
+            array (
134
+                'name' => 'email1',
135 135
             ),
136 136
             array (
137
-              'name' => 'lead_source',
137
+                'name' => 'lead_source',
138
+            ),
138 139
             ),
139
-          ),
140 140
 
141
-          array (
141
+            array (
142 142
 
143 143
             array (
144
-              'name' => 'assigned_user_name',
144
+                'name' => 'assigned_user_name',
145 145
             ),
146
-          ),
146
+            ),
147
+        ),
147 148
         ),
148
-      ),
149 149
     ),
150
-  ),
150
+    ),
151 151
 );
152 152
 ?>
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 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.
@@ -44,17 +44,17 @@  discard block
 block discarded – undo
44 44
  * All Rights Reserved.
45 45
  * Contributor(s): ______________________________________..
46 46
  ********************************************************************************/
47
-$viewdefs = array (
47
+$viewdefs = array(
48 48
   'Contacts' => 
49
-  array (
49
+  array(
50 50
     'QuickCreate' => 
51
-    array (
51
+    array(
52 52
       'templateMeta' => 
53
-      array (
53
+      array(
54 54
         'form' => 
55
-        array (
55
+        array(
56 56
           'hidden' => 
57
-          array (
57
+          array(
58 58
             '<input type="hidden" name="opportunity_id" value="{$smarty.request.opportunity_id}">',
59 59
             '<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
60 60
             '<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
@@ -66,81 +66,81 @@  discard block
 block discarded – undo
66 66
         ),
67 67
         'maxColumns' => '2',
68 68
         'widths' => 
69
-        array (
70
-          array (
69
+        array(
70
+          array(
71 71
             'label' => '10',
72 72
             'field' => '30',
73 73
           ),
74
-          array (
74
+          array(
75 75
             'label' => '10',
76 76
             'field' => '30',
77 77
           ),
78 78
         ),
79 79
       ),
80 80
       'panels' => 
81
-      array (
81
+      array(
82 82
         'default' => 
83
-        array (
83
+        array(
84 84
 
85
-          array (
85
+          array(
86 86
 
87
-            array (
87
+            array(
88 88
               'name' => 'first_name',
89 89
                 'customCode' => '{html_options name="salutation" id="salutation" options=$fields.salutation.options selected=$fields.salutation.value}'
90 90
                 . '&nbsp;<input name="first_name" id="first_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
91 91
             ),
92 92
 
93
-            array (
93
+            array(
94 94
               'name' => 'account_name',
95 95
             ),
96 96
           ),
97 97
 
98
-          array (
98
+          array(
99 99
 
100
-            array (
100
+            array(
101 101
               'name' => 'last_name',
102 102
               'displayParams'=>array('required'=>true),
103 103
             ),
104 104
 
105
-            array (
105
+            array(
106 106
               'name' => 'phone_work',
107 107
             ),
108 108
           ),
109 109
 
110
-          array (
110
+          array(
111 111
 
112
-            array (
112
+            array(
113 113
               'name' => 'title',
114 114
             ),
115 115
 
116
-            array (
116
+            array(
117 117
               'name' => 'phone_mobile',
118 118
             ),
119 119
           ),
120 120
 
121
-          array (
121
+          array(
122 122
 
123
-            array (
123
+            array(
124 124
               'name' => 'phone_fax',
125 125
             ),
126 126
 
127
-            array (
127
+            array(
128 128
               'name' => 'do_not_call',
129 129
             ),
130 130
           ),
131 131
 
132
-          array (
133
-            array (
132
+          array(
133
+            array(
134 134
               'name' => 'email1',
135 135
             ),
136
-            array (
136
+            array(
137 137
               'name' => 'lead_source',
138 138
             ),
139 139
           ),
140 140
 
141
-          array (
141
+          array(
142 142
 
143
-            array (
143
+            array(
144 144
               'name' => 'assigned_user_name',
145 145
             ),
146 146
           ),
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@
 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.
Please login to merge, or discard this patch.
modules/Contacts/metadata/metafiles.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -43,12 +43,12 @@
 block discarded – undo
43 43
  * To change the template for this generated file go to
44 44
  * Window - Preferences - PHPeclipse - PHP - Code Templates
45 45
  */
46
- $metafiles['Contacts'] = array(
47
-	'detailviewdefs'  => 	'modules/Contacts/metadata/detailviewdefs.php', 	
48
-	'editviewdefs'    => 	'modules/Contacts/metadata/editviewdefs.php',
49
- 	'listviewdefs'    => 	'modules/Contacts/metadata/listviewdefs.php',
50
- 	'searchdefs'      =>    'modules/Contacts/metadata/searchdefs.php',
51
- 	'popupdefs'	      =>    'modules/Contacts/metadata/popupdefs.php',
52
- 	'searchfields'	  =>    'modules/Contacts/metadata/SearchFields.php',
53
- );
46
+    $metafiles['Contacts'] = array(
47
+    'detailviewdefs'  => 	'modules/Contacts/metadata/detailviewdefs.php', 	
48
+    'editviewdefs'    => 	'modules/Contacts/metadata/editviewdefs.php',
49
+        'listviewdefs'    => 	'modules/Contacts/metadata/listviewdefs.php',
50
+        'searchdefs'      =>    'modules/Contacts/metadata/searchdefs.php',
51
+        'popupdefs'	      =>    'modules/Contacts/metadata/popupdefs.php',
52
+        'searchfields'	  =>    'modules/Contacts/metadata/SearchFields.php',
53
+    );
54 54
 ?>
Please login to merge, or discard this patch.
modules/Contacts/metadata/listviewdefs.php 3 patches
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -42,61 +42,61 @@  discard block
 block discarded – undo
42 42
 
43 43
 
44 44
 $listViewDefs['Contacts'] = array(
45
-	'NAME' => array(
46
-		'width' => '20%', 		
47
-		'label' => 'LBL_LIST_NAME', 
48
-		'link' => true,
45
+    'NAME' => array(
46
+        'width' => '20%', 		
47
+        'label' => 'LBL_LIST_NAME', 
48
+        'link' => true,
49 49
         'contextMenu' => array('objectType' => 'sugarPerson', 
50
-                               'metaData' => array('contact_id' => '{$ID}', 
51
-                                                   'module' => 'Contacts',
52
-                                                   'return_action' => 'ListView', 
53
-                                                   'contact_name' => '{$FULL_NAME}', 
54
-                                                   'parent_id' => '{$ACCOUNT_ID}',
55
-                                                   'parent_name' => '{$ACCOUNT_NAME}',
56
-                                                   'return_module' => 'Contacts', 
57
-                                                   'return_action' => 'ListView', 
58
-                                                   'parent_type' => 'Account', 
59
-                                                   'notes_parent_type' => 'Account')
60
-                              ),
61
-		'orderBy' => 'name',
50
+                                'metaData' => array('contact_id' => '{$ID}', 
51
+                                                    'module' => 'Contacts',
52
+                                                    'return_action' => 'ListView', 
53
+                                                    'contact_name' => '{$FULL_NAME}', 
54
+                                                    'parent_id' => '{$ACCOUNT_ID}',
55
+                                                    'parent_name' => '{$ACCOUNT_NAME}',
56
+                                                    'return_module' => 'Contacts', 
57
+                                                    'return_action' => 'ListView', 
58
+                                                    'parent_type' => 'Account', 
59
+                                                    'notes_parent_type' => 'Account')
60
+                                ),
61
+        'orderBy' => 'name',
62 62
         'default' => true,
63 63
         'related_fields' => array('first_name', 'last_name', 'salutation', 'account_name', 'account_id'),
64
-		), 
65
-	'TITLE' => array(
66
-		'width' => '15%', 
67
-		'label' => 'LBL_LIST_TITLE',
64
+        ), 
65
+    'TITLE' => array(
66
+        'width' => '15%', 
67
+        'label' => 'LBL_LIST_TITLE',
68 68
         'default' => true), 
69
-	'ACCOUNT_NAME' => array(
70
-		'width' => '34%', 
71
-		'label' => 'LBL_LIST_ACCOUNT_NAME', 
72
-		'module' => 'Accounts',
73
-		'id' => 'ACCOUNT_ID',
74
-		'link' => true,
69
+    'ACCOUNT_NAME' => array(
70
+        'width' => '34%', 
71
+        'label' => 'LBL_LIST_ACCOUNT_NAME', 
72
+        'module' => 'Accounts',
73
+        'id' => 'ACCOUNT_ID',
74
+        'link' => true,
75 75
         'contextMenu' => array('objectType' => 'sugarAccount', 
76
-                               'metaData' => array('return_module' => 'Contacts', 
77
-                                                   'return_action' => 'ListView', 
78
-                                                   'module' => 'Accounts',
79
-                                                   'return_action' => 'ListView', 
80
-                                                   'parent_id' => '{$ACCOUNT_ID}', 
81
-                                                   'parent_name' => '{$ACCOUNT_NAME}', 
82
-                                                   'account_id' => '{$ACCOUNT_ID}', 
83
-                                                   'account_name' => '{$ACCOUNT_NAME}'),
84
-                              ),
76
+                                'metaData' => array('return_module' => 'Contacts', 
77
+                                                    'return_action' => 'ListView', 
78
+                                                    'module' => 'Accounts',
79
+                                                    'return_action' => 'ListView', 
80
+                                                    'parent_id' => '{$ACCOUNT_ID}', 
81
+                                                    'parent_name' => '{$ACCOUNT_NAME}', 
82
+                                                    'account_id' => '{$ACCOUNT_ID}', 
83
+                                                    'account_name' => '{$ACCOUNT_NAME}'),
84
+                                ),
85 85
         'default' => true,
86 86
         'sortable'=> true,
87 87
         'ACLTag' => 'ACCOUNT',
88 88
         'related_fields' => array('account_id')),
89
-	'EMAIL1' => array(
90
-		'width' => '15%', 
91
-		'label' => 'LBL_LIST_EMAIL_ADDRESS',
92
-		'sortable' => false,
93
-		'link' => true,
94
-		'customCode' => '{$EMAIL1_LINK}{$EMAIL1}</a>',
89
+    'EMAIL1' => array(
90
+        'width' => '15%', 
91
+        'label' => 'LBL_LIST_EMAIL_ADDRESS',
92
+        'sortable' => false,
93
+        'link' => true,
94
+        'customCode' => '{$EMAIL1_LINK}{$EMAIL1}</a>',
95 95
         'default' => true
96
-		),  
97
-	'PHONE_WORK' => array(
98
-		'width' => '15%', 
99
-		'label' => 'LBL_OFFICE_PHONE',
96
+        ),  
97
+    'PHONE_WORK' => array(
98
+        'width' => '15%', 
99
+        'label' => 'LBL_OFFICE_PHONE',
100 100
         'default' => true),
101 101
     'DEPARTMENT' => array(
102 102
         'width' => '10', 
@@ -177,6 +177,6 @@  discard block
 block discarded – undo
177 177
     'DATE_ENTERED' => array(
178 178
         'width' => '10', 
179 179
         'label' => 'LBL_DATE_ENTERED',
180
-		'default' => true)       
180
+        'default' => true)       
181 181
 );
182 182
 ?>
Please login to merge, or discard this 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.
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
     'MODIFIED_BY_NAME' => array(
168 168
         'width' => '10', 
169 169
         'label' => 'LBL_MODIFIED'),
170
-    'SYNC_CONTACT' => array (
170
+    'SYNC_CONTACT' => array(
171 171
         'type' => 'bool',
172 172
         'label' => 'LBL_SYNC_CONTACT',
173 173
         'width' => '10%',
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@
 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.
Please login to merge, or discard this patch.
modules/Contacts/views/view.detail.php 3 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -44,27 +44,27 @@
 block discarded – undo
44 44
 
45 45
 class ContactsViewDetail extends ViewDetail
46 46
 {
47
- 	/**
48
- 	 * @see SugarView::display()
49
-	 *
50
- 	 * We are overridding the display method to manipulate the portal information.
51
- 	 * If portal is not enabled then don't show the portal fields.
52
- 	 */
53
-	public function display(){
54
-		global $sugar_config;
47
+        /**
48
+         * @see SugarView::display()
49
+         *
50
+         * We are overridding the display method to manipulate the portal information.
51
+         * If portal is not enabled then don't show the portal fields.
52
+         */
53
+    public function display(){
54
+        global $sugar_config;
55 55
 
56
-		$aop_portal_enabled = !empty($sugar_config['aop']['enable_portal']) && !empty($sugar_config['aop']['enable_aop']);
56
+        $aop_portal_enabled = !empty($sugar_config['aop']['enable_portal']) && !empty($sugar_config['aop']['enable_aop']);
57 57
 
58
-		$this->ss->assign("AOP_PORTAL_ENABLED", $aop_portal_enabled);
58
+        $this->ss->assign("AOP_PORTAL_ENABLED", $aop_portal_enabled);
59 59
 
60
-		require_once('modules/AOS_PDF_Templates/formLetter.php');
61
-		formLetter::DVPopupHtml('Contacts');
60
+        require_once('modules/AOS_PDF_Templates/formLetter.php');
61
+        formLetter::DVPopupHtml('Contacts');
62 62
 
63
-		$admin = new Administration();
64
-		$admin->retrieveSettings();
65
-		if(isset($admin->settings['portal_on']) && $admin->settings['portal_on']) {
66
-			$this->ss->assign("PORTAL_ENABLED", true);
67
-		}
68
-		parent::display();
69
-	}
63
+        $admin = new Administration();
64
+        $admin->retrieveSettings();
65
+        if(isset($admin->settings['portal_on']) && $admin->settings['portal_on']) {
66
+            $this->ss->assign("PORTAL_ENABLED", true);
67
+        }
68
+        parent::display();
69
+    }
70 70
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 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
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
  	 * We are overridding the display method to manipulate the portal information.
51 51
  	 * If portal is not enabled then don't show the portal fields.
52 52
  	 */
53
-	public function display(){
53
+	public function display() {
54 54
 		global $sugar_config;
55 55
 
56 56
 		$aop_portal_enabled = !empty($sugar_config['aop']['enable_portal']) && !empty($sugar_config['aop']['enable_aop']);
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 		$admin = new Administration();
64 64
 		$admin->retrieveSettings();
65
-		if(isset($admin->settings['portal_on']) && $admin->settings['portal_on']) {
65
+		if (isset($admin->settings['portal_on']) && $admin->settings['portal_on']) {
66 66
 			$this->ss->assign("PORTAL_ENABLED", true);
67 67
 		}
68 68
 		parent::display();
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@
 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
  * SugarCRM Community Edition is a customer relationship management program developed by
Please login to merge, or discard this patch.
modules/Contacts/views/view.quickcreate.php 3 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -46,17 +46,17 @@
 block discarded – undo
46 46
 {
47 47
     public function preDisplay() 
48 48
     {
49
-    	parent::preDisplay();
50
-    	if($this->_isDCForm) {
51
-    		//XXX TODO 20110329 Frank Steegmans: Hack to make quick create fields populate when used through the DC menu
52
-    		//          NOTE HOWEVER that sqs_objects form fields are not properly populated because of some other hacks
53
-    		//          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;
60
-	   	}
49
+        parent::preDisplay();
50
+        if($this->_isDCForm) {
51
+            //XXX TODO 20110329 Frank Steegmans: Hack to make quick create fields populate when used through the DC menu
52
+            //          NOTE HOWEVER that sqs_objects form fields are not properly populated because of some other hacks
53
+            //          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;
60
+            }
61 61
     }    
62 62
 }
63 63
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  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) die('Not A Valid Entry Point');
4 4
 /*********************************************************************************
5 5
  * SugarCRM Community Edition is a customer relationship management program developed by
6 6
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,16 +47,16 @@  discard block
 block discarded – undo
47 47
     public function preDisplay() 
48 48
     {
49 49
     	parent::preDisplay();
50
-    	if($this->_isDCForm) {
50
+    	if ($this->_isDCForm) {
51 51
     		//XXX TODO 20110329 Frank Steegmans: Hack to make quick create fields populate when used through the DC menu
52 52
     		//          NOTE HOWEVER that sqs_objects form fields are not properly populated because of some other hacks
53 53
     		//          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;
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;
60 60
 	   	}
61 61
     }    
62 62
 }
63 63
\ No newline at end of file
Please login to merge, or discard this 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 3 patches
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.
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -42,13 +42,13 @@
 block discarded – undo
42 42
 
43 43
 class ContactsViewCloseContactAddressPopup extends ViewList {
44 44
 	
45
- 	function CloseContactAddressPopup(){
46
- 		parent::__construct();
47
- 	}
45
+        function CloseContactAddressPopup(){
46
+            parent::__construct();
47
+        }
48 48
 
49
- 	function display() {
49
+        function display() {
50 50
         if(isset($_REQUEST['close_window'])) echo "<script>window.close();</script>";
51 51
         parent::display();
52
- 	}	
52
+        }	
53 53
 }
54 54
 ?>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,12 +42,12 @@
 block discarded – undo
42 42
 
43 43
 class ContactsViewCloseContactAddressPopup extends ViewList {
44 44
 	
45
- 	function CloseContactAddressPopup(){
45
+ 	function CloseContactAddressPopup() {
46 46
  		parent::__construct();
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'])) echo "<script>window.close();</script>";
51 51
         parent::display();
52 52
  	}	
53 53
 }
Please login to merge, or discard this patch.
modules/Contacts/views/view.validportalusername.php 3 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -54,17 +54,17 @@  discard block
 block discarded – undo
54 54
 
55 55
 class ContactsViewValidPortalUsername extends SugarView 
56 56
 {
57
- 	/**
58
-     * @see SugarView::process()
59
-     */
57
+        /**
58
+         * @see SugarView::process()
59
+         */
60 60
     public function process() 
61
- 	{
62
-		$this->display();
63
- 	}
61
+        {
62
+        $this->display();
63
+        }
64 64
 
65
- 	/**
66
-     * @see SugarView::display()
67
-     */
65
+        /**
66
+         * @see SugarView::display()
67
+         */
68 68
     public function display()
69 69
     {
70 70
         if (!empty($_REQUEST['portal_name'])) {
@@ -76,6 +76,6 @@  discard block
 block discarded – undo
76 76
             echo $total;
77 77
         }
78 78
         else
79
-           echo '0';
80
- 	}	
79
+            echo '0';
80
+        }	
81 81
 }
82 82
\ No newline at end of file
Please login to merge, or discard this 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.
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
             $portalUsername = $this->bean->db->quote($_REQUEST['portal_name']);
72 72
             $result = $this->bean->db->query("Select count(id) as total from contacts where portal_name = '$portalUsername' and deleted='0'");
73 73
             $total = 0;
74
-            while($row = $this->bean->db->fetchByAssoc($result))
74
+            while ($row = $this->bean->db->fetchByAssoc($result))
75 75
                 $total = $row['total'];
76 76
             echo $total;
77 77
         }
Please login to merge, or discard this patch.
Braces   +8 added lines, -5 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.
@@ -71,11 +73,12 @@  discard block
 block discarded – undo
71 73
             $portalUsername = $this->bean->db->quote($_REQUEST['portal_name']);
72 74
             $result = $this->bean->db->query("Select count(id) as total from contacts where portal_name = '$portalUsername' and deleted='0'");
73 75
             $total = 0;
74
-            while($row = $this->bean->db->fetchByAssoc($result))
75
-                $total = $row['total'];
76
+            while($row = $this->bean->db->fetchByAssoc($result)) {
77
+                            $total = $row['total'];
78
+            }
76 79
             echo $total;
80
+        } else {
81
+                   echo '0';
77 82
         }
78
-        else
79
-           echo '0';
80 83
  	}	
81 84
 }
82 85
\ No newline at end of file
Please login to merge, or discard this patch.
modules/Contacts/ContactOpportunityRelationshipEdit.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
 }
63 63
 
64 64
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
65
-	$focus->id = "";
65
+    $focus->id = "";
66 66
 }
67 67
 
68 68
 // Prepopulate either side of the relationship if passed in.
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 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.
@@ -57,11 +57,11 @@  discard block
 block discarded – undo
57 57
 
58 58
 $focus = new ContactOpportunityRelationship();
59 59
 
60
-if(isset($_REQUEST['record'])) {
60
+if (isset($_REQUEST['record'])) {
61 61
     $focus->retrieve($_REQUEST['record']);
62 62
 }
63 63
 
64
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
64
+if (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
65 65
 	$focus->id = "";
66 66
 }
67 67
 
@@ -80,10 +80,10 @@  discard block
 block discarded – undo
80 80
 $qsd = QuickSearchDefaults::getQuickSearchDefaults();
81 81
 $sqs_objects = array('opportunity_name' => $qsd->getQSParent());
82 82
 $sqs_objects['opportunity_name']['populate_list'] = array('opportunity_name', 'opportunity_id');
83
-$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = ' . $json->encode($sqs_objects) . '</script>';
83
+$quicksearch_js = '<script type="text/javascript" language="javascript">sqs_objects = '.$json->encode($sqs_objects).'</script>';
84 84
 echo $quicksearch_js;
85 85
 
86
-$xtpl=new XTemplate ('modules/Contacts/ContactOpportunityRelationshipEdit.html');
86
+$xtpl = new XTemplate('modules/Contacts/ContactOpportunityRelationshipEdit.html');
87 87
 $xtpl->assign("MOD", $mod_strings);
88 88
 $xtpl->assign("APP", $app_strings);
89 89
 
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
 $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
94 94
 $xtpl->assign("PRINT_URL", "index.php?".$GLOBALS['request_string']);
95 95
 $xtpl->assign("ID", $focus->id);
96
-$xtpl->assign("CONTACT",$contactName = Array("NAME" => $focus->contact_name, "ID" => $focus->contact_id));
97
-$xtpl->assign("OPPORTUNITY",$oppName = Array("NAME" => $focus->opportunity_name, "ID" => $focus->opportunity_id));
96
+$xtpl->assign("CONTACT", $contactName = Array("NAME" => $focus->contact_name, "ID" => $focus->contact_id));
97
+$xtpl->assign("OPPORTUNITY", $oppName = Array("NAME" => $focus->opportunity_name, "ID" => $focus->opportunity_id));
98 98
 
99
-echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_CONTACT_OPP_FORM_TITLE']." ".$contactName['NAME'] . " - ". $oppName['NAME']), true);
99
+echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_CONTACT_OPP_FORM_TITLE']." ".$contactName['NAME']." - ".$oppName['NAME']), true);
100 100
 
101 101
 $xtpl->assign("CONTACT_ROLE_OPTIONS", get_select_options_with_id($app_list_strings['opportunity_relationship_type_dom'], $focus->contact_role));
102 102
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 $javascript = new javascript();
112 112
 $javascript->setFormName('EditView');
113 113
 $javascript->setSugarBean($focus);
114
-$javascript->addToValidateBinaryDependency('opportunity_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'] . $mod_strings['LBL_OPP_NAME'], 'false', '', 'opportunity_id');
114
+$javascript->addToValidateBinaryDependency('opportunity_name', 'alpha', $app_strings['ERR_SQS_NO_MATCH_FIELD'].$mod_strings['LBL_OPP_NAME'], 'false', '', 'opportunity_id');
115 115
 echo $javascript->getScript();
116 116
 
117 117
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@
 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.
Please login to merge, or discard this patch.
modules/ACLActions/actiondefs.override.php 3 patches
Indentation   +87 added lines, -87 removed lines patch added patch discarded remove patch
@@ -35,103 +35,103 @@
 block discarded – undo
35 35
  * "Powered by SugarCRM".
36 36
  ********************************************************************************/
37 37
 
38
- if(!defined('ACL_ALLOW_NONE')){   
39
- 	define('ACL_ALLOW_ADMIN_DEV', 100);
40
- 	define('ACL_ALLOW_ADMIN', 99);
41
- 	define('ACL_ALLOW_ALL', 90);                        
42
- 	define('ACL_ALLOW_ENABLED', 89);
43
- 	/* BEGIN - SECURITY GROUPS */ 
44
- 	define('ACL_ALLOW_GROUP', 80); //securitygroup
45
- 	/* END - SECURITY GROUPS */ 
46
- 	define('ACL_ALLOW_OWNER', 75);
47
- 	define('ACL_ALLOW_NORMAL', 1);
48
- 	define('ACL_ALLOW_DEFAULT', 0);
49
- 	define('ACL_ALLOW_DISABLED', -98);
50
- 	define('ACL_ALLOW_NONE', -99);
51
- 	define('ACL_ALLOW_DEV', 95);
52
- }
53
- /**
54
-  * $GLOBALS['ACLActionAccessLevels
55
-  * these are rendering descriptions for Access Levels giving information such as the label, color, and text color to use when rendering the access level
56
-  */
57
- $GLOBALS['ACLActionAccessLevels'] = array(
58
- 	ACL_ALLOW_ALL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ALL', 'text_color'=>'white'),
59
- 	ACL_ALLOW_OWNER=>array('color'=>'#6F6800', 'label'=>'LBL_ACCESS_OWNER', 'text_color'=>'white'),
60
- 	ACL_ALLOW_NONE=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_NONE', 'text_color'=>'white'),
61
- 	ACL_ALLOW_ENABLED=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ENABLED', 'text_color'=>'white'),
62
- 	ACL_ALLOW_DISABLED=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_DISABLED', 'text_color'=>'white'),
63
- 	ACL_ALLOW_ADMIN=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN', 'text_color'=>'white'),
64
- 	ACL_ALLOW_NORMAL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_NORMAL', 'text_color'=>'white'),
65
- 	ACL_ALLOW_DEFAULT=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_DEFAULT', 'text_color'=>'white'),
66
- 	ACL_ALLOW_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_DEV', 'text_color'=>'white'),
67
- 	ACL_ALLOW_ADMIN_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN_DEV', 'text_color'=>'white'),
68
- 	/* BEGIN - SECURITY GROUPS */ 
69
- 	ACL_ALLOW_GROUP=>array('color'=>'#0000A0', 'label'=>'LBL_ACCESS_GROUP', 'text_color'=>'white'), //securitygroup
70
- 	/* END - SECURITY GROUPS */ 
71
- 	);
38
+    if(!defined('ACL_ALLOW_NONE')){   
39
+        define('ACL_ALLOW_ADMIN_DEV', 100);
40
+        define('ACL_ALLOW_ADMIN', 99);
41
+        define('ACL_ALLOW_ALL', 90);                        
42
+        define('ACL_ALLOW_ENABLED', 89);
43
+        /* BEGIN - SECURITY GROUPS */ 
44
+        define('ACL_ALLOW_GROUP', 80); //securitygroup
45
+        /* END - SECURITY GROUPS */ 
46
+        define('ACL_ALLOW_OWNER', 75);
47
+        define('ACL_ALLOW_NORMAL', 1);
48
+        define('ACL_ALLOW_DEFAULT', 0);
49
+        define('ACL_ALLOW_DISABLED', -98);
50
+        define('ACL_ALLOW_NONE', -99);
51
+        define('ACL_ALLOW_DEV', 95);
52
+    }
53
+    /**
54
+     * $GLOBALS['ACLActionAccessLevels
55
+     * these are rendering descriptions for Access Levels giving information such as the label, color, and text color to use when rendering the access level
56
+     */
57
+    $GLOBALS['ACLActionAccessLevels'] = array(
58
+        ACL_ALLOW_ALL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ALL', 'text_color'=>'white'),
59
+        ACL_ALLOW_OWNER=>array('color'=>'#6F6800', 'label'=>'LBL_ACCESS_OWNER', 'text_color'=>'white'),
60
+        ACL_ALLOW_NONE=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_NONE', 'text_color'=>'white'),
61
+        ACL_ALLOW_ENABLED=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ENABLED', 'text_color'=>'white'),
62
+        ACL_ALLOW_DISABLED=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_DISABLED', 'text_color'=>'white'),
63
+        ACL_ALLOW_ADMIN=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN', 'text_color'=>'white'),
64
+        ACL_ALLOW_NORMAL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_NORMAL', 'text_color'=>'white'),
65
+        ACL_ALLOW_DEFAULT=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_DEFAULT', 'text_color'=>'white'),
66
+        ACL_ALLOW_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_DEV', 'text_color'=>'white'),
67
+        ACL_ALLOW_ADMIN_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN_DEV', 'text_color'=>'white'),
68
+        /* BEGIN - SECURITY GROUPS */ 
69
+        ACL_ALLOW_GROUP=>array('color'=>'#0000A0', 'label'=>'LBL_ACCESS_GROUP', 'text_color'=>'white'), //securitygroup
70
+        /* END - SECURITY GROUPS */ 
71
+        );
72 72
 /**
73
- * $GLOBALS['ACLActions
74
- * These are the actions for a given type. It includes the ACCESS Levels for that action and the label for that action. Every an object of the category (e.g. module) is added all associated actions are added for that object
75
- */
73
+         * $GLOBALS['ACLActions
74
+         * These are the actions for a given type. It includes the ACCESS Levels for that action and the label for that action. Every an object of the category (e.g. module) is added all associated actions are added for that object
75
+         */
76 76
 /* BEGIN - SECURITY GROUPS */ 
77 77
 $GLOBALS['ACLActions'] = array(
78
-	'module'=>array('actions'=>
79
-						array(
80
-						'access'=>
81
-								array(
82
-									'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
83
-									'label'=>'LBL_ACTION_ACCESS',
84
-									'default'=>ACL_ALLOW_ENABLED,
85
-								),
78
+    'module'=>array('actions'=>
79
+                        array(
80
+                        'access'=>
81
+                                array(
82
+                                    'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
83
+                                    'label'=>'LBL_ACTION_ACCESS',
84
+                                    'default'=>ACL_ALLOW_ENABLED,
85
+                                ),
86 86
 							
87
-						'view'=>
88
-								array(
89
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
90
-									'label'=>'LBL_ACTION_VIEW',
91
-									'default'=>ACL_ALLOW_ALL,
92
-								),
87
+                        'view'=>
88
+                                array(
89
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
90
+                                    'label'=>'LBL_ACTION_VIEW',
91
+                                    'default'=>ACL_ALLOW_ALL,
92
+                                ),
93 93
 					
94
-						'list'=>
95
-								array(
96
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
97
-									'label'=>'LBL_ACTION_LIST',
98
-									'default'=>ACL_ALLOW_ALL,
99
-								),
100
-						'edit'=>
101
-								array(
102
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
103
-									'label'=>'LBL_ACTION_EDIT',
104
-									'default'=>ACL_ALLOW_ALL,
94
+                        'list'=>
95
+                                array(
96
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
97
+                                    'label'=>'LBL_ACTION_LIST',
98
+                                    'default'=>ACL_ALLOW_ALL,
99
+                                ),
100
+                        'edit'=>
101
+                                array(
102
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
103
+                                    'label'=>'LBL_ACTION_EDIT',
104
+                                    'default'=>ACL_ALLOW_ALL,
105 105
 									
106
-								),
107
-						'delete'=>
108
-							array(
109
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
110
-									'label'=>'LBL_ACTION_DELETE',
111
-									'default'=>ACL_ALLOW_ALL,
106
+                                ),
107
+                        'delete'=>
108
+                            array(
109
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
110
+                                    'label'=>'LBL_ACTION_DELETE',
111
+                                    'default'=>ACL_ALLOW_ALL,
112 112
 									
113
-								),
114
-						'import'=>
115
-							array(
116
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
117
-									'label'=>'LBL_ACTION_IMPORT',
118
-									'default'=>ACL_ALLOW_ALL,
119
-								),
120
-						'export'=>
121
-							array(
122
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
123
-									'label'=>'LBL_ACTION_EXPORT',
124
-									'default'=>ACL_ALLOW_ALL,
125
-								),
113
+                                ),
114
+                        'import'=>
115
+                            array(
116
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
117
+                                    'label'=>'LBL_ACTION_IMPORT',
118
+                                    'default'=>ACL_ALLOW_ALL,
119
+                                ),
120
+                        'export'=>
121
+                            array(
122
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
123
+                                    'label'=>'LBL_ACTION_EXPORT',
124
+                                    'default'=>ACL_ALLOW_ALL,
125
+                                ),
126 126
                         'massupdate'=>
127
-							array(
128
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
129
-									'label'=>'LBL_ACTION_MASSUPDATE',
130
-									'default'=>ACL_ALLOW_ALL,
131
-								),
127
+                            array(
128
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
129
+                                    'label'=>'LBL_ACTION_MASSUPDATE',
130
+                                    'default'=>ACL_ALLOW_ALL,
131
+                                ),
132 132
 						
133 133
 					
134
-				),),
134
+                ),),
135 135
 );
136 136
 /* END - SECURITY GROUPS */ 
137 137
 
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 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-2011 SugarCRM Inc.
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
  * "Powered by SugarCRM".
36 36
  ********************************************************************************/
37 37
 
38
- if(!defined('ACL_ALLOW_NONE')){   
38
+ if (!defined('ACL_ALLOW_NONE')) {   
39 39
  	define('ACL_ALLOW_ADMIN_DEV', 100);
40 40
  	define('ACL_ALLOW_ADMIN', 99);
41 41
  	define('ACL_ALLOW_ALL', 90);                        
@@ -79,53 +79,53 @@  discard block
 block discarded – undo
79 79
 						array(
80 80
 						'access'=>
81 81
 								array(
82
-									'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
82
+									'aclaccess'=>array(ACL_ALLOW_ENABLED, ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
83 83
 									'label'=>'LBL_ACTION_ACCESS',
84 84
 									'default'=>ACL_ALLOW_ENABLED,
85 85
 								),
86 86
 							
87 87
 						'view'=>
88 88
 								array(
89
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
89
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_GROUP, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
90 90
 									'label'=>'LBL_ACTION_VIEW',
91 91
 									'default'=>ACL_ALLOW_ALL,
92 92
 								),
93 93
 					
94 94
 						'list'=>
95 95
 								array(
96
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
96
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_GROUP, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
97 97
 									'label'=>'LBL_ACTION_LIST',
98 98
 									'default'=>ACL_ALLOW_ALL,
99 99
 								),
100 100
 						'edit'=>
101 101
 								array(
102
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
102
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_GROUP, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
103 103
 									'label'=>'LBL_ACTION_EDIT',
104 104
 									'default'=>ACL_ALLOW_ALL,
105 105
 									
106 106
 								),
107 107
 						'delete'=>
108 108
 							array(
109
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
109
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_GROUP, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
110 110
 									'label'=>'LBL_ACTION_DELETE',
111 111
 									'default'=>ACL_ALLOW_ALL,
112 112
 									
113 113
 								),
114 114
 						'import'=>
115 115
 							array(
116
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
116
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
117 117
 									'label'=>'LBL_ACTION_IMPORT',
118 118
 									'default'=>ACL_ALLOW_ALL,
119 119
 								),
120 120
 						'export'=>
121 121
 							array(
122
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
122
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_GROUP, ACL_ALLOW_OWNER, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
123 123
 									'label'=>'LBL_ACTION_EXPORT',
124 124
 									'default'=>ACL_ALLOW_ALL,
125 125
 								),
126 126
                         'massupdate'=>
127 127
 							array(
128
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
128
+									'aclaccess'=>array(ACL_ALLOW_ALL, ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
129 129
 									'label'=>'LBL_ACTION_MASSUPDATE',
130 130
 									'default'=>ACL_ALLOW_ALL,
131 131
 								),
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@
 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-2011 SugarCRM Inc.
Please login to merge, or discard this patch.