adamjakab / SuiteCRM

modules/Prospects/metadata/popupdefs.php

Indentation +18 added lines, -18 removed lines

@@ -42,24 +42,24 @@
 global $mod_strings;
 
 $popupMeta = array('moduleMain' => 'Prospect',
-						'varName' => 'PROSPECT',
-						'orderBy' => 'prospects.last_name, prospects.first_name',
-						'whereClauses' => 
-							array('first_name' => 'prospects.first_name',
-									'last_name' => 'prospects.last_name'),
-						'searchInputs' =>
-							array('first_name', 'last_name'),
-						'selectDoms' =>
-							array('LIST_OPTIONS' => 
-											array('dom' => 'prospect_list_type_dom', 'searchInput' => 'list_type'),
-								  ),
-						'create' =>
-							array('formBase' => 'ProspectFormBase.php',
-									'formBaseClass' => 'ProspectFormBase',
-									'getFormBodyParams' => array('','','ProspectSave'),
-									'createButton' => 'LNK_NEW_PROSPECT'
-								  )
-						);
+                        'varName' => 'PROSPECT',
+                        'orderBy' => 'prospects.last_name, prospects.first_name',
+                        'whereClauses' => 
+                            array('first_name' => 'prospects.first_name',
+                                    'last_name' => 'prospects.last_name'),
+                        'searchInputs' =>
+                            array('first_name', 'last_name'),
+                        'selectDoms' =>
+                            array('LIST_OPTIONS' => 
+                                            array('dom' => 'prospect_list_type_dom', 'searchInput' => 'list_type'),
+                                    ),
+                        'create' =>
+                            array('formBase' => 'ProspectFormBase.php',
+                                    'formBaseClass' => 'ProspectFormBase',
+                                    'getFormBodyParams' => array('','','ProspectSave'),
+                                    'createButton' => 'LNK_NEW_PROSPECT'
+                                    )
+                        );
 
 
 ?>

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,7 +56,7 @@ 
 						'create' =>
 							array('formBase' => 'ProspectFormBase.php',
 									'formBaseClass' => 'ProspectFormBase',
-									'getFormBodyParams' => array('','','ProspectSave'),
+									'getFormBodyParams' => array('', '', 'ProspectSave'),
 									'createButton' => 'LNK_NEW_PROSPECT'
 								  )
 						);

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Prospects/metadata/searchdefs.php

Indentation +22 added lines, -22 removed lines

@@ -39,31 +39,31 @@
 
 
 $searchdefs['Prospects'] = array(
-				'templateMeta' => array(
-						'maxColumns' => '3',
+                'templateMeta' => array(
+                        'maxColumns' => '3',
                         'maxColumnsBasic' => '4', 
                         'widths' => array('label' => '10', 'field' => '30'), 
-                       ),
+                        ),
                 'layout' => array(
-  					'basic_search' => array(
- 							array('name'=>'search_name','label' =>'LBL_NAME', 'type' => 'name'),
-                           array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
+                        'basic_search' => array(
+                                array('name'=>'search_name','label' =>'LBL_NAME', 'type' => 'name'),
+                            array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
                            
-						),
-					'advanced_search' => array(
-							'first_name', 
-							'last_name', 
-							array('name' => 'phone', 'label' =>'LBL_ANY_PHONE', 'type' => 'name'),
-							array('name' => 'email', 'label' =>'LBL_ANY_EMAIL', 'type' => 'name'),
-							'assistant',
-							'do_not_call',
-							array('name' => 'address_street', 'label'=>'LBL_ANY_ADDRESS', 'type' => 'name'),
-							array('name' => 'address_state', 'label' =>'LBL_STATE', 'type' => 'name'),
-							array('name' => 'address_postalcode', 'label' =>'LBL_POSTAL_CODE', 'type' => 'name'),
-							array('name' => 'primary_address_country', 'label' =>'LBL_COUNTRY', 'type' => 'name', 'options' => 'countries_dom', ), 
-							array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
+                        ),
+                    'advanced_search' => array(
+                            'first_name', 
+                            'last_name', 
+                            array('name' => 'phone', 'label' =>'LBL_ANY_PHONE', 'type' => 'name'),
+                            array('name' => 'email', 'label' =>'LBL_ANY_EMAIL', 'type' => 'name'),
+                            'assistant',
+                            'do_not_call',
+                            array('name' => 'address_street', 'label'=>'LBL_ANY_ADDRESS', 'type' => 'name'),
+                            array('name' => 'address_state', 'label' =>'LBL_STATE', 'type' => 'name'),
+                            array('name' => 'address_postalcode', 'label' =>'LBL_POSTAL_CODE', 'type' => 'name'),
+                            array('name' => 'primary_address_country', 'label' =>'LBL_COUNTRY', 'type' => 'name', 'options' => 'countries_dom', ), 
+                            array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
 							
-					),
-				),
-		   );
+                    ),
+                ),
+            );
 ?>

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
                        ),
                 'layout' => array(
   					'basic_search' => array(
- 							array('name'=>'search_name','label' =>'LBL_NAME', 'type' => 'name'),
+ 							array('name'=>'search_name', 'label' =>'LBL_NAME', 'type' => 'name'),
                            array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
                            
 						),
@@ -60,7 +60,7 @@ 
 							array('name' => 'address_street', 'label'=>'LBL_ANY_ADDRESS', 'type' => 'name'),
 							array('name' => 'address_state', 'label' =>'LBL_STATE', 'type' => 'name'),
 							array('name' => 'address_postalcode', 'label' =>'LBL_POSTAL_CODE', 'type' => 'name'),
-							array('name' => 'primary_address_country', 'label' =>'LBL_COUNTRY', 'type' => 'name', 'options' => 'countries_dom', ), 
+							array('name' => 'primary_address_country', 'label' =>'LBL_COUNTRY', 'type' => 'name', 'options' => 'countries_dom',), 
 							array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
 							
 					),

modules/Prospects/metadata/SearchFields.php

Indentation +31 added lines, -31 removed lines

@@ -39,35 +39,35 @@
  ********************************************************************************/
 
 $searchFields['Prospects'] = 
-	array (
-		'first_name' => array( 'query_type'=>'default'),
-		'last_name'=> array('query_type'=>'default'),
-		'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
-		'do_not_call'=> array('query_type'=>'default', 'operator'=>'='),
-		'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','phone_home')),
-		'email'=> array(
-			'query_type' => 'default',
-			'operator' => 'subquery',
-			'subquery' => 'SELECT eabr.bean_id FROM email_addr_bean_rel eabr JOIN email_addresses ea ON (ea.id = eabr.email_address_id) WHERE eabr.deleted=0 AND ea.email_address LIKE',
-			'db_field' => array(
-				'id',
-			),
-		),
-		'assistant'=> array('query_type'=>'default'),
-		'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
-		'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
-		'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
-		'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
-		'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
-		'assigned_user_id'=> array('query_type'=>'default'),
-	   //Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-	   //Range Search Support
-	);
+    array (
+        'first_name' => array( 'query_type'=>'default'),
+        'last_name'=> array('query_type'=>'default'),
+        'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
+        'do_not_call'=> array('query_type'=>'default', 'operator'=>'='),
+        'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','phone_home')),
+        'email'=> array(
+            'query_type' => 'default',
+            'operator' => 'subquery',
+            'subquery' => 'SELECT eabr.bean_id FROM email_addr_bean_rel eabr JOIN email_addresses ea ON (ea.id = eabr.email_address_id) WHERE eabr.deleted=0 AND ea.email_address LIKE',
+            'db_field' => array(
+                'id',
+            ),
+        ),
+        'assistant'=> array('query_type'=>'default'),
+        'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
+        'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
+        'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
+        'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
+        'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
+        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'assigned_user_id'=> array('query_type'=>'default'),
+        //Range Search Support 
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support
+    );
 ?>

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,12 +39,12 @@ 
  ********************************************************************************/
 
 $searchFields['Prospects'] = 
-	array (
-		'first_name' => array( 'query_type'=>'default'),
+	array(
+		'first_name' => array('query_type'=>'default'),
 		'last_name'=> array('query_type'=>'default'),
-		'search_name'=> array('query_type'=>'default','db_field'=>array('first_name','last_name'),'force_unifiedsearch'=>true),
+		'search_name'=> array('query_type'=>'default', 'db_field'=>array('first_name', 'last_name'), 'force_unifiedsearch'=>true),
 		'do_not_call'=> array('query_type'=>'default', 'operator'=>'='),
-		'phone'=> array('query_type'=>'default','db_field'=>array('phone_mobile','phone_work','phone_other','phone_fax','phone_home')),
+		'phone'=> array('query_type'=>'default', 'db_field'=>array('phone_mobile', 'phone_work', 'phone_other', 'phone_fax', 'phone_home')),
 		'email'=> array(
 			'query_type' => 'default',
 			'operator' => 'subquery',
@@ -54,20 +54,20 @@ 
 			),
 		),
 		'assistant'=> array('query_type'=>'default'),
-		'address_street'=> array('query_type'=>'default','db_field'=>array('primary_address_street','alt_address_street')),
-		'address_city'=> array('query_type'=>'default','db_field'=>array('primary_address_city','alt_address_city')),
-		'address_state'=> array('query_type'=>'default','db_field'=>array('primary_address_state','alt_address_state')),
-		'address_postalcode'=> array('query_type'=>'default','db_field'=>array('primary_address_postalcode','alt_address_postalcode')),
-		'address_country'=> array('query_type'=>'default','db_field'=>array('primary_address_country','alt_address_country')),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+		'address_street'=> array('query_type'=>'default', 'db_field'=>array('primary_address_street', 'alt_address_street')),
+		'address_city'=> array('query_type'=>'default', 'db_field'=>array('primary_address_city', 'alt_address_city')),
+		'address_state'=> array('query_type'=>'default', 'db_field'=>array('primary_address_state', 'alt_address_state')),
+		'address_postalcode'=> array('query_type'=>'default', 'db_field'=>array('primary_address_postalcode', 'alt_address_postalcode')),
+		'address_country'=> array('query_type'=>'default', 'db_field'=>array('primary_address_country', 'alt_address_country')),
+		'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
 		'assigned_user_id'=> array('query_type'=>'default'),
 	   //Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
 	   //Range Search Support
 	);
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Prospects/metadata/detailviewdefs.php

Indentation +85 added lines, -85 removed lines

@@ -39,188 +39,188 @@
 
 $viewdefs ['Prospects'] = 
 array (
-  'DetailView' => 
-  array (
+    'DetailView' => 
+    array (
     'templateMeta' => 
     array (
-      'form' => 
-      array (
+        'form' => 
+        array (
         'buttons' => 
         array (
-          0 => 'EDIT',
-          1 => 'DUPLICATE',
-          2 => 'DELETE',
-          3 => 
-          array (
+            0 => 'EDIT',
+            1 => 'DUPLICATE',
+            2 => 'DELETE',
+            3 => 
+            array (
             'customCode' => '<input title="{$MOD.LBL_CONVERT_BUTTON_TITLE}" class="button" onclick="this.form.return_module.value=\'Prospects\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';this.form.module.value=\'Leads\';this.form.action.value=\'EditView\';" type="submit" name="CONVERT_LEAD_BTN" value="{$MOD.LBL_CONVERT_BUTTON_LABEL}"/>',
             'sugar_html' => 
             array (
-              'type' => 'submit',
-              'value' => '{$MOD.LBL_CONVERT_BUTTON_LABEL}',
-              'htmlOptions' => 
-              array (
+                'type' => 'submit',
+                'value' => '{$MOD.LBL_CONVERT_BUTTON_LABEL}',
+                'htmlOptions' => 
+                array (
                 'class' => 'button',
                 'name' => 'CONVERT_LEAD_BTN',
                 'id' => 'convert_target_button',
                 'title' => '{$MOD.LBL_CONVERT_BUTTON_TITLE}',
                 'onclick' => 'this.form.return_module.value=\'Prospects\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';this.form.module.value=\'Leads\';this.form.action.value=\'EditView\';',
-              ),
+                ),
             ),
-          ),
-          4 => 
-          array (
+            ),
+            4 => 
+            array (
             'customCode' => '<input title="{$APP.LBL_MANAGE_SUBSCRIPTIONS}" class="button" onclick="this.form.return_module.value=\'Prospects\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'; this.form.action.value=\'Subscriptions\'; this.form.module.value=\'Campaigns\';" type="submit" name="Manage Subscriptions" value="{$APP.LBL_MANAGE_SUBSCRIPTIONS}"/>',
             'sugar_html' => 
             array (
-              'type' => 'submit',
-              'value' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
-              'htmlOptions' => 
-              array (
+                'type' => 'submit',
+                'value' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
+                'htmlOptions' => 
+                array (
                 'class' => 'button',
                 'id' => 'manage_subscriptions_button',
                 'name' => 'Manage Subscriptions',
                 'title' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
                 'onclick' => 'this.form.return_module.value=\'Prospects\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'; this.form.action.value=\'Subscriptions\'; this.form.module.value=\'Campaigns\';',
-              ),
+                ),
+            ),
             ),
-          ),
         ),
         'hidden' => 
         array (
-          0 => '<input type="hidden" name="prospect_id" value="{$fields.id.value}">',
+            0 => '<input type="hidden" name="prospect_id" value="{$fields.id.value}">',
         ),
         'headerTpl' => 'modules/Prospects/tpls/DetailViewHeader.tpl',
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        ),
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'useTabs' => true,
-      'tabDefs' => 
-      array (
+        'useTabs' => true,
+        'tabDefs' => 
+        array (
         'LBL_PROSPECT_INFORMATION' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
         ),
         'LBL_MORE_INFORMATION' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'lbl_prospect_information' => 
-      array (
+        'lbl_prospect_information' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'full_name',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 'title',
-          1 => 
-          array (
+            0 => 'title',
+            1 => 
+            array (
             'name' => 'phone_work',
             'label' => 'LBL_OFFICE_PHONE',
-          ),
+            ),
         ),
         2 => 
         array (
-          0 => 'department',
-          1 => 'phone_mobile',
+            0 => 'department',
+            1 => 'phone_mobile',
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'account_name',
-          ),
-          1 => 'phone_fax',
+            ),
+            1 => 'phone_fax',
         ),
         4 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'primary_address_street',
             'label' => 'LBL_PRIMARY_ADDRESS',
             'type' => 'address',
             'displayParams' => 
             array (
-              'key' => 'primary',
+                'key' => 'primary',
+            ),
             ),
-          ),
-          1 => 
-          array (
+            1 => 
+            array (
             'name' => 'alt_address_street',
             'label' => 'LBL_ALTERNATE_ADDRESS',
             'type' => 'address',
             'displayParams' => 
             array (
-              'key' => 'alt',
+                'key' => 'alt',
+            ),
             ),
-          ),
         ),
         5 => 
         array (
-          0 => 'email1',
+            0 => 'email1',
         ),
         6 => 
         array (
-          0 => 'description',
+            0 => 'description',
         ),
         7 => 
         array (
-          0 => 'assigned_user_name',
+            0 => 'assigned_user_name',
         ),
-      ),
-      'LBL_MORE_INFORMATION' => 
-      array (
+        ),
+        'LBL_MORE_INFORMATION' => 
+        array (
         0 => 
         array (
-          0 => 'email_opt_out',
-          1 => 'do_not_call',
+            0 => 'email_opt_out',
+            1 => 'do_not_call',
+        ),
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' => 
-      array (
+        'LBL_PANEL_ASSIGNMENT' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'modified_by_name',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_MODIFIED',
-          ),
-          1 =>
-          array (
+            ),
+            1 =>
+            array (
             'name' => 'created_by_name',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_ENTERED',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

Spacing +42 added lines, -42 removed lines

@@ -38,27 +38,27 @@ 
  ********************************************************************************/
 
 $viewdefs ['Prospects'] = 
-array (
+array(
   'DetailView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'form' => 
-      array (
+      array(
         'buttons' => 
-        array (
+        array(
           0 => 'EDIT',
           1 => 'DUPLICATE',
           2 => 'DELETE',
           3 => 
-          array (
+          array(
             'customCode' => '<input title="{$MOD.LBL_CONVERT_BUTTON_TITLE}" class="button" onclick="this.form.return_module.value=\'Prospects\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';this.form.module.value=\'Leads\';this.form.action.value=\'EditView\';" type="submit" name="CONVERT_LEAD_BTN" value="{$MOD.LBL_CONVERT_BUTTON_LABEL}"/>',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'submit',
               'value' => '{$MOD.LBL_CONVERT_BUTTON_LABEL}',
               'htmlOptions' => 
-              array (
+              array(
                 'class' => 'button',
                 'name' => 'CONVERT_LEAD_BTN',
                 'id' => 'convert_target_button',
@@ -68,14 +68,14 @@ 
             ),
           ),
           4 => 
-          array (
+          array(
             'customCode' => '<input title="{$APP.LBL_MANAGE_SUBSCRIPTIONS}" class="button" onclick="this.form.return_module.value=\'Prospects\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'; this.form.action.value=\'Subscriptions\'; this.form.module.value=\'Campaigns\';" type="submit" name="Manage Subscriptions" value="{$APP.LBL_MANAGE_SUBSCRIPTIONS}"/>',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'submit',
               'value' => '{$APP.LBL_MANAGE_SUBSCRIPTIONS}',
               'htmlOptions' => 
-              array (
+              array(
                 'class' => 'button',
                 'id' => 'manage_subscriptions_button',
                 'name' => 'Manage Subscriptions',
@@ -86,134 +86,134 @@ 
           ),
         ),
         'hidden' => 
-        array (
+        array(
           0 => '<input type="hidden" name="prospect_id" value="{$fields.id.value}">',
         ),
         'headerTpl' => 'modules/Prospects/tpls/DetailViewHeader.tpl',
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'useTabs' => true,
       'tabDefs' => 
-      array (
+      array(
         'LBL_PROSPECT_INFORMATION' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_MORE_INFORMATION' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
     'panels' => 
-    array (
+    array(
       'lbl_prospect_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'full_name',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 'title',
           1 => 
-          array (
+          array(
             'name' => 'phone_work',
             'label' => 'LBL_OFFICE_PHONE',
           ),
         ),
         2 => 
-        array (
+        array(
           0 => 'department',
           1 => 'phone_mobile',
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'account_name',
           ),
           1 => 'phone_fax',
         ),
         4 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'primary_address_street',
             'label' => 'LBL_PRIMARY_ADDRESS',
             'type' => 'address',
             'displayParams' => 
-            array (
+            array(
               'key' => 'primary',
             ),
           ),
           1 => 
-          array (
+          array(
             'name' => 'alt_address_street',
             'label' => 'LBL_ALTERNATE_ADDRESS',
             'type' => 'address',
             'displayParams' => 
-            array (
+            array(
               'key' => 'alt',
             ),
           ),
         ),
         5 => 
-        array (
+        array(
           0 => 'email1',
         ),
         6 => 
-        array (
+        array(
           0 => 'description',
         ),
         7 => 
-        array (
+        array(
           0 => 'assigned_user_name',
         ),
       ),
       'LBL_MORE_INFORMATION' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 'email_opt_out',
           1 => 'do_not_call',
         ),
       ),
       'LBL_PANEL_ASSIGNMENT' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'modified_by_name',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_MODIFIED',
           ),
           1 =>
-          array (
+          array(
             'name' => 'created_by_name',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_ENTERED',

modules/Prospects/metadata/quickcreatedefs.php

Indentation +54 added lines, -54 removed lines

@@ -46,121 +46,121 @@
  ********************************************************************************/
 
 $viewdefs = array (
-  'Prospects' => 
-  array (
+    'Prospects' => 
+    array (
     'QuickCreate' => 
     array (
-      'templateMeta' => 
-      array (
+        'templateMeta' => 
+        array (
         'maxColumns' => '2',
         'widths' => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'label' => '10',
             'field' => '30',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'label' => '10',
             'field' => '30',
-          ),
+            ),
         ),
-      ),
-      'panels' => 
-      array (
+        ),
+        'panels' => 
+        array (
         'LBL_PROSPECT_INFORMATION' => 
         array (
-          0 => 
-          array (
             0 => 
             array (
-              'name' => 'first_name',
+            0 => 
+            array (
+                'name' => 'first_name',
             ),
             1 => 
             array (
-              'name' => 'phone_work',
+                'name' => 'phone_work',
             ),
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             0 => 
             array (
-              'name' => 'last_name',
-              'displayParams'=>array('required'=>true)
+                'name' => 'last_name',
+                'displayParams'=>array('required'=>true)
             ),
             1 => 
             array (
-              'name' => 'phone_mobile',
+                'name' => 'phone_mobile',
+            ),
             ),
-          ),
-          2 => 
-          array (
+            2 => 
+            array (
             0 => 
             array (
-              'name' => 'account_name',
+                'name' => 'account_name',
             ),
             1 => 
             array (
-              'name' => 'phone_fax',
+                'name' => 'phone_fax',
+            ),
             ),
-          ),
-          3 => 
-          array (
+            3 => 
+            array (
             0 => 
             array (
-              'name' => 'title',
+                'name' => 'title',
             ),
             1 => 
             array (
-              'name' => 'department',
+                'name' => 'department',
+            ),
             ),
-          ),
-          4 => 
-          array (
+            4 => 
+            array (
             0 => 
             array (
-              'name' => 'team_name',
+                'name' => 'team_name',
             ),
             1 => 
             array (
-              'name' => 'do_not_call',
+                'name' => 'do_not_call',
+            ),
             ),
-          ),
-          5 => 
-          array (
+            5 => 
+            array (
             0 => 
             array (
-              'name' => 'assigned_user_name',
+                'name' => 'assigned_user_name',
+            ),
             ),
-          ),
         ),
         'lbl_email_addresses' => 
         array (
-          0 => 
-          array (
             0 => 
             array (
-              'name' => 'email1',
+            0 => 
+            array (
+                'name' => 'email1',
+            ),
             ),
-          ),
         ),
         'LBL_ADDRESS_INFORMATION' => 
         array (
-          0 => 
-          array (
             0 => 
             array (
-              'name' => 'primary_address_street',
+            0 => 
+            array (
+                'name' => 'primary_address_street',
             ),
             1 => 
             array (
-              'name' => 'alt_address_street',
+                'name' => 'alt_address_street',
+            ),
             ),
-          ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

Spacing +34 added lines, -34 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,116 +45,116 @@ 
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 
-$viewdefs = array (
+$viewdefs = array(
   'Prospects' => 
-  array (
+  array(
     'QuickCreate' => 
-    array (
+    array(
       'templateMeta' => 
-      array (
+      array(
         'maxColumns' => '2',
         'widths' => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'label' => '10',
             'field' => '30',
           ),
           1 => 
-          array (
+          array(
             'label' => '10',
             'field' => '30',
           ),
         ),
       ),
       'panels' => 
-      array (
+      array(
         'LBL_PROSPECT_INFORMATION' => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             0 => 
-            array (
+            array(
               'name' => 'first_name',
             ),
             1 => 
-            array (
+            array(
               'name' => 'phone_work',
             ),
           ),
           1 => 
-          array (
+          array(
             0 => 
-            array (
+            array(
               'name' => 'last_name',
               'displayParams'=>array('required'=>true)
             ),
             1 => 
-            array (
+            array(
               'name' => 'phone_mobile',
             ),
           ),
           2 => 
-          array (
+          array(
             0 => 
-            array (
+            array(
               'name' => 'account_name',
             ),
             1 => 
-            array (
+            array(
               'name' => 'phone_fax',
             ),
           ),
           3 => 
-          array (
+          array(
             0 => 
-            array (
+            array(
               'name' => 'title',
             ),
             1 => 
-            array (
+            array(
               'name' => 'department',
             ),
           ),
           4 => 
-          array (
+          array(
             0 => 
-            array (
+            array(
               'name' => 'team_name',
             ),
             1 => 
-            array (
+            array(
               'name' => 'do_not_call',
             ),
           ),
           5 => 
-          array (
+          array(
             0 => 
-            array (
+            array(
               'name' => 'assigned_user_name',
             ),
           ),
         ),
         'lbl_email_addresses' => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             0 => 
-            array (
+            array(
               'name' => 'email1',
             ),
           ),
         ),
         'LBL_ADDRESS_INFORMATION' => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             0 => 
-            array (
+            array(
               'name' => 'primary_address_street',
             ),
             1 => 
-            array (
+            array(
               'name' => 'alt_address_street',
             ),
           ),

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Prospects/metadata/listviewdefs.php

Indentation +10 added lines, -10 removed lines

@@ -42,10 +42,10 @@ 
 
 
 $listViewDefs['Prospects'] = array(
-	'FULL_NAME' => array(
-		'width' => '20', 
-		'label' => 'LBL_LIST_NAME', 
-		'link' => true,
+    'FULL_NAME' => array(
+        'width' => '20', 
+        'label' => 'LBL_LIST_NAME', 
+        'link' => true,
         'related_fields' => array('first_name', 'last_name'),
         'orderBy' => 'last_name',
         'default' => true),
@@ -65,11 +65,11 @@ 
         'label' => 'LBL_LIST_PHONE', 
         'link' => false,
         'default' => true), 
-	'DATE_ENTERED' => array (
-	    'type' => 'datetime',
-	    'label' => 'LBL_DATE_ENTERED',
-	    'width' => '10',
-	    'default' => true,
-	  ),  
+    'DATE_ENTERED' => array (
+        'type' => 'datetime',
+        'label' => 'LBL_DATE_ENTERED',
+        'width' => '10',
+        'default' => true,
+        ),  
 );
 ?>

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -101,7 +101,7 @@ 
         'label' => 'LBL_LIST_STATUS', 
         'link' => false,
         'default' => false),
-	'DATE_ENTERED' => array (
+	'DATE_ENTERED' => array(
 	    'width' => '10',
 	    'label' => 'LBL_DATE_ENTERED',
 	    'default' => true),            

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Reminders/vardefs.php

Spacing +5 added lines, -5 removed lines

@@ -37,9 +37,9 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-$dictionary['Reminder']['table']= 'reminders';
-$dictionary['Reminder']['audited']= false;
-$dictionary['Reminder']['fields']= array(
+$dictionary['Reminder']['table'] = 'reminders';
+$dictionary['Reminder']['audited'] = false;
+$dictionary['Reminder']['fields'] = array(
     'popup' => array(
         'name' => 'popup',
         'vname' => 'LBL_POPUP',
@@ -102,9 +102,9 @@ 
 );
 
 
-if (!class_exists('VardefManager')){
+if (!class_exists('VardefManager')) {
     require_once('include/SugarObjects/VardefManager.php');
 }
-VardefManager::createVardef('Reminders','Reminder', array('basic','assignable'));
+VardefManager::createVardef('Reminders', 'Reminder', array('basic', 'assignable'));
 
 ?>
\ No newline at end of file

modules/Reminders/Reminder.php

Indentation +522 added lines, -522 removed lines

@@ -43,7 +43,7 @@ 
  */
 class Reminder extends Basic {
 
-	const UPGRADE_VERSION = '7.4.3';
+    const UPGRADE_VERSION = '7.4.3';
 
     var $name;
 
@@ -51,19 +51,19 @@ 
     var $module_dir = 'Reminders';
     var $object_name = 'Reminder';
     var $table_name = 'reminders';
-	var $tracker_visibility = false;
+    var $tracker_visibility = false;
     var $importable = false;
     var $disable_row_level_security = true;
 
     var $popup;
     var $email;
     var $email_sent = false;
-	var $timer_popup;
-	var $timer_email;
-	var $related_event_module;
-	var $related_event_module_id;
+    var $timer_popup;
+    var $timer_email;
+    var $related_event_module;
+    var $related_event_module_id;
 
-	private static $remindersData = array();
+    private static $remindersData = array();
 
     public function __construct() {
         parent::Basic();
@@ -76,17 +76,17 @@ 
         return false;
     }
 
-	// ---- save and load remainders on EditViews
+    // ---- save and load remainders on EditViews
 	
-	/**
-	 * Save multiple reminders data from clients Meetings/Calls EditView.
-	 * Call this static function in save action.
-	 * 
-	 * @param string $eventModule Event Bean module name (e.g. Meetings, Calls)
-	 * @param string $eventModuleId Event Bean GUID
-	 * @param string $remindersDataJson Remainders data as Json string from POST data.
-	 * @throws Exception throw an Exception if json format is invalid.
-	 */
+    /**
+     * Save multiple reminders data from clients Meetings/Calls EditView.
+     * Call this static function in save action.
+     * 
+     * @param string $eventModule Event Bean module name (e.g. Meetings, Calls)
+     * @param string $eventModuleId Event Bean GUID
+     * @param string $remindersDataJson Remainders data as Json string from POST data.
+     * @throws Exception throw an Exception if json format is invalid.
+     */
     public static function saveRemindersDataJson($eventModule, $eventModuleId, $remindersDataJson) {
         $reminderData = json_decode($remindersDataJson);
         if(!json_last_error()) {
@@ -100,7 +100,7 @@ 
     private static function saveRemindersData($eventModule, $eventModuleId, $remindersData) {
         $savedReminderIds = array();
         foreach($remindersData as $reminderData) {
-			if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $reminderData->id = '';
+            if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $reminderData->id = '';
             $reminderBean = BeanFactory::getBean('Reminders', $reminderData->id);
             $reminderBean->popup = $reminderData->popup;
             $reminderBean->email = $reminderData->email;
@@ -123,18 +123,18 @@ 
                 }
             }
         }
-		unset(self::$remindersData[$eventModule][$eventModuleId]);
+        unset(self::$remindersData[$eventModule][$eventModuleId]);
     }
 
-	/**
-	 * Load multiple reminders JSON data for related Event module EditViews.
-	 * Call this function in module display function.
-	 * 
-	 * @param string $eventModule Related event module name (Meetings/Calls)
-	 * @param string $eventModuleId Related event GUID
-	 * @return string JSON string contains the remainders
-	 * @throws Exception
-	 */
+    /**
+     * Load multiple reminders JSON data for related Event module EditViews.
+     * Call this function in module display function.
+     * 
+     * @param string $eventModule Related event module name (Meetings/Calls)
+     * @param string $eventModuleId Related event GUID
+     * @return string JSON string contains the remainders
+     * @throws Exception
+     */
     public static function loadRemindersDataJson($eventModule, $eventModuleId, $isDuplicate = false) {
         $remindersData = self::loadRemindersData($eventModule, $eventModuleId, $isDuplicate);
         $remindersDataJson = json_encode($remindersData);
@@ -144,551 +144,551 @@ 
         return $remindersDataJson;
     }
 
-	/**
-	 * Load multiple reminders data for related Event module EditViews.
-	 * Call this function in module display function.
-	 *
-	 * @param string $eventModule Related event module name (Meetings/Calls)
-	 * @param string $eventModuleId Related event GUID
-	 * @return array contains the remainders
-	 * @throws Exception
-	 */
-	public static function loadRemindersData($eventModule, $eventModuleId, $isDuplicate = false) {
-		if(!isset(self::$remindersData[$eventModule][$eventModuleId]) || !$eventModuleId || $isDuplicate) {
-			$ret = array();
-			$reminders = BeanFactory::getBean('Reminders')->get_full_list("reminders.date_entered", "reminders.related_event_module = '$eventModule' AND reminders.related_event_module_id = '$eventModuleId'");
-			if ($reminders) {
-				foreach ($reminders as $reminder) {
-					$ret[] = array(
-							'id' => $isDuplicate ? null : $reminder->id,
-							'popup' => $reminder->popup,
-							'email' => $reminder->email,
-							'timer_popup' => $reminder->timer_popup,
-							'timer_email' => $reminder->timer_email,
-							'invitees' => Reminder_Invitee::loadRemindersInviteesData($reminder->id, $isDuplicate),
-					);
-				}
-			}
-			self::$remindersData[$eventModule][$eventModuleId] = $ret;
-		}
-		return self::$remindersData[$eventModule][$eventModuleId];
-	}
+    /**
+     * Load multiple reminders data for related Event module EditViews.
+     * Call this function in module display function.
+     *
+     * @param string $eventModule Related event module name (Meetings/Calls)
+     * @param string $eventModuleId Related event GUID
+     * @return array contains the remainders
+     * @throws Exception
+     */
+    public static function loadRemindersData($eventModule, $eventModuleId, $isDuplicate = false) {
+        if(!isset(self::$remindersData[$eventModule][$eventModuleId]) || !$eventModuleId || $isDuplicate) {
+            $ret = array();
+            $reminders = BeanFactory::getBean('Reminders')->get_full_list("reminders.date_entered", "reminders.related_event_module = '$eventModule' AND reminders.related_event_module_id = '$eventModuleId'");
+            if ($reminders) {
+                foreach ($reminders as $reminder) {
+                    $ret[] = array(
+                            'id' => $isDuplicate ? null : $reminder->id,
+                            'popup' => $reminder->popup,
+                            'email' => $reminder->email,
+                            'timer_popup' => $reminder->timer_popup,
+                            'timer_email' => $reminder->timer_email,
+                            'invitees' => Reminder_Invitee::loadRemindersInviteesData($reminder->id, $isDuplicate),
+                    );
+                }
+            }
+            self::$remindersData[$eventModule][$eventModuleId] = $ret;
+        }
+        return self::$remindersData[$eventModule][$eventModuleId];
+    }
 	
-	// ---- sending email reminders
+    // ---- sending email reminders
 	
-	/**
-	 * Sending multiple email reminders. 
-	 * Call in EmainReminder and use original EmailRemainder class for sending.
-	 * 
-	 * @param EmailReminder $emailReminder Caller EmailReminder
-	 * @param Administration $admin Administration module for EmailRemainder->sendReminders() function
-	 * @param boolean $checkDecline (optional) Send email if user accept status is not decline. Default is TRUE.
-	 */
-	public static function sendEmailReminders(EmailReminder $emailReminder, Administration $admin, $checkDecline = true) {
+    /**
+     * Sending multiple email reminders. 
+     * Call in EmainReminder and use original EmailRemainder class for sending.
+     * 
+     * @param EmailReminder $emailReminder Caller EmailReminder
+     * @param Administration $admin Administration module for EmailRemainder->sendReminders() function
+     * @param boolean $checkDecline (optional) Send email if user accept status is not decline. Default is TRUE.
+     */
+    public static function sendEmailReminders(EmailReminder $emailReminder, Administration $admin, $checkDecline = true) {
         if($reminders = self::getUnsentEmailReminders()) {
             foreach($reminders as $reminderId => $reminder) {
-				$recipients = self::getEmailReminderInviteesRecipients($reminderId, $checkDecline);
-				$eventBean = BeanFactory::getBean($reminder->related_event_module, $reminder->related_event_module_id);
-				if ( $emailReminder->sendReminders($eventBean, $admin, $recipients) ) {
-					$reminder->email_sent = 1;
-					$reminder->save();
-				}
+                $recipients = self::getEmailReminderInviteesRecipients($reminderId, $checkDecline);
+                $eventBean = BeanFactory::getBean($reminder->related_event_module, $reminder->related_event_module_id);
+                if ( $emailReminder->sendReminders($eventBean, $admin, $recipients) ) {
+                    $reminder->email_sent = 1;
+                    $reminder->save();
+                }
             }
         }
     }
 	
-	private static function getEmailReminderInviteesRecipients($reminderId, $checkDecline = true) {
-		$emails = array();
-		$reminder = BeanFactory::getBean('Reminders', $reminderId);
-		$eventModule = $reminder->related_event_module;
-		$eventModuleId = $reminder->related_event_module_id;		
-		$event = BeanFactory::getBean($eventModule, $eventModuleId);
-		if(!isset($event->status) || $event->status != 'Held') {
-			$invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '$reminderId'");
-			foreach($invitees as $invitee) {
-				$inviteeModule = $invitee->related_invitee_module;
-				$inviteeModuleId = $invitee->related_invitee_module_id;
-				$personBean = BeanFactory::getBean($inviteeModule, $inviteeModuleId);
-				// The original email reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
-				if($checkDecline && !self::isDecline($event, $personBean)) {
-					if ( !empty($personBean->email1) ) {
-						$arr = array(
-							'type' => $inviteeModule,
-							'name' => $personBean->full_name,
-							'email' => $personBean->email1,
-						);
-						$emails[] = $arr;
-					}
-				}
-			}
-		}
-		return $emails;
-	}	
+    private static function getEmailReminderInviteesRecipients($reminderId, $checkDecline = true) {
+        $emails = array();
+        $reminder = BeanFactory::getBean('Reminders', $reminderId);
+        $eventModule = $reminder->related_event_module;
+        $eventModuleId = $reminder->related_event_module_id;		
+        $event = BeanFactory::getBean($eventModule, $eventModuleId);
+        if(!isset($event->status) || $event->status != 'Held') {
+            $invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '$reminderId'");
+            foreach($invitees as $invitee) {
+                $inviteeModule = $invitee->related_invitee_module;
+                $inviteeModuleId = $invitee->related_invitee_module_id;
+                $personBean = BeanFactory::getBean($inviteeModule, $inviteeModuleId);
+                // The original email reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
+                if($checkDecline && !self::isDecline($event, $personBean)) {
+                    if ( !empty($personBean->email1) ) {
+                        $arr = array(
+                            'type' => $inviteeModule,
+                            'name' => $personBean->full_name,
+                            'email' => $personBean->email1,
+                        );
+                        $emails[] = $arr;
+                    }
+                }
+            }
+        }
+        return $emails;
+    }	
 
     private static function getUnsentEmailReminders() {
         global $db;
-		$reminders = array();
-		$reminderBeans = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.email = 1 AND reminders.email_sent = 0");
-		foreach($reminderBeans as $reminderBean) {
-			$eventBean = BeanFactory::getBean($reminderBean->related_event_module, $reminderBean->related_event_module_id);
-			$dateStart = $eventBean->date_start;
-			$time = strtotime($db->fromConvert($dateStart,'datetime'));
-			$dateStart = date(TimeDate::DB_DATETIME_FORMAT, $time);
-			$remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($dateStart,'datetime'))->modify("-{$reminderBean->timer_email} seconds")->ts;
+        $reminders = array();
+        $reminderBeans = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.email = 1 AND reminders.email_sent = 0");
+        foreach($reminderBeans as $reminderBean) {
+            $eventBean = BeanFactory::getBean($reminderBean->related_event_module, $reminderBean->related_event_module_id);
+            $dateStart = $eventBean->date_start;
+            $time = strtotime($db->fromConvert($dateStart,'datetime'));
+            $dateStart = date(TimeDate::DB_DATETIME_FORMAT, $time);
+            $remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($dateStart,'datetime'))->modify("-{$reminderBean->timer_email} seconds")->ts;
             $now_ts = $GLOBALS['timedate']->getNow()->ts;
             if ( $now_ts >= $remind_ts ) {
                 $reminders[$reminderBean->id] = $reminderBean;
             }
-		}
+        }
         return $reminders;
     }
 	
-	// ---- popup and alert reminders
+    // ---- popup and alert reminders
 	
-	/**
-	 * Show a popup and/or desktop notification alert for related users with related Event information.
-	 * Call in jsAlerts class and use original jsAlerts for show notifications.
-	 * 
-	 * @global ??? $current_user
-	 * @global ??? $timedate
-	 * @global ??? $app_list_strings
-	 * @global ??? $db
-	 * @global ??? $sugar_config
-	 * @global ??? $app_strings
-	 * @param jsAlerts $alert caller jsAlerts object
-	 * @param boolean $checkDecline (optional) Send email if user accept status is not decline. Default is TRUE.
-	 * @return ???
-	 */
-	public static function addNotifications(jsAlerts $alert, $checkDecline = true) {
-		global $current_user, $timedate, $app_list_strings, $db, $sugar_config, $app_strings;
-
-		if (empty($current_user->id)) {
+    /**
+     * Show a popup and/or desktop notification alert for related users with related Event information.
+     * Call in jsAlerts class and use original jsAlerts for show notifications.
+     * 
+     * @global ??? $current_user
+     * @global ??? $timedate
+     * @global ??? $app_list_strings
+     * @global ??? $db
+     * @global ??? $sugar_config
+     * @global ??? $app_strings
+     * @param jsAlerts $alert caller jsAlerts object
+     * @param boolean $checkDecline (optional) Send email if user accept status is not decline. Default is TRUE.
+     * @return ???
+     */
+    public static function addNotifications(jsAlerts $alert, $checkDecline = true) {
+        global $current_user, $timedate, $app_list_strings, $db, $sugar_config, $app_strings;
+
+        if (empty($current_user->id)) {
             return;
-		}
+        }
 		
-		//Create separate variable to hold timedate value
+        //Create separate variable to hold timedate value
         $alertDateTimeNow = $timedate->nowDb();
 
-		// cn: get a boundary limiter
-		$dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
-		$dateTimeNow = $timedate->nowDb();
+        // cn: get a boundary limiter
+        $dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
+        $dateTimeNow = $timedate->nowDb();
 
-		$dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
-		$dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
+        $dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
+        $dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
 		
-		// Original jsAlert used to a meeting integration.
+        // Original jsAlert used to a meeting integration.
 		
-		///////////////////////////////////////////////////////////////////////
-		////	MEETING INTEGRATION
-		$meetingIntegration = null;
-		if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
-			if(!class_exists($sugar_config['meeting_integration'])) {
-				require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
-			}
-			$meetingIntegration = new $sugar_config['meeting_integration']();
-		}
-		////	END MEETING INTEGRATION
-		///////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////
+        ////	MEETING INTEGRATION
+        $meetingIntegration = null;
+        if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
+            if(!class_exists($sugar_config['meeting_integration'])) {
+                require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
+            }
+            $meetingIntegration = new $sugar_config['meeting_integration']();
+        }
+        ////	END MEETING INTEGRATION
+        ///////////////////////////////////////////////////////////////////////
 		
-		$popupReminders = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.popup = 1");
-
-		if($popupReminders) {
-			foreach($popupReminders as $popupReminder) {
-				$relatedEvent = BeanFactory::getBean($popupReminder->related_event_module, $popupReminder->related_event_module_id);
-				if( $relatedEvent &&
-					(!isset($relatedEvent->status) || $relatedEvent->status == 'Planned') &&
-					(!isset($relatedEvent->date_start) || (strtotime($relatedEvent->date_start) >= strtotime(self::unQuoteTime($dateTimeNow)) && strtotime($relatedEvent->date_start) <= strtotime(self::unQuoteTime($dateTimeMax))) ) &&
-					(!$checkDecline || ($checkDecline && !self::isDecline($relatedEvent, BeanFactory::getBean('Users', $current_user->id))))
-				) {
-					// The original popup/alert reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
-					$invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '{$popupReminder->id}' AND reminders_invitees.related_invitee_module_id = '{$current_user->id}'");
-					if($invitees) {
-						foreach($invitees as $invitee) {
-							// need to concatenate since GMT times can bridge two local days
-							$timeStart = strtotime($db->fromConvert(isset($relatedEvent->date_start) ? $relatedEvent->date_start : date(TimeDate::DB_DATETIME_FORMAT), 'datetime'));
-							$timeRemind = $popupReminder->timer_popup;
-							$timeStart -= $timeRemind;
-
-							$url = 'index.php?action=DetailView&module=' . $popupReminder->related_event_module . '&record=' . $popupReminder->related_event_module_id;
-							$instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
-
-							if($popupReminder->related_event_module == 'Meetings') {
-								///////////////////////////////////////////////////////////////////
-								////	MEETING INTEGRATION
-								if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($popupReminder->related_event_module_id)) {
-									$url = $meetingIntegration->miUrlGetJsAlert((array) $popupReminder);
-									$instructions = $meetingIntegration->miGetJsAlertInstructions();
-								}
-								////	END MEETING INTEGRATION
-								///////////////////////////////////////////////////////////////////								
-							}
+        $popupReminders = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.popup = 1");
+
+        if($popupReminders) {
+            foreach($popupReminders as $popupReminder) {
+                $relatedEvent = BeanFactory::getBean($popupReminder->related_event_module, $popupReminder->related_event_module_id);
+                if( $relatedEvent &&
+                    (!isset($relatedEvent->status) || $relatedEvent->status == 'Planned') &&
+                    (!isset($relatedEvent->date_start) || (strtotime($relatedEvent->date_start) >= strtotime(self::unQuoteTime($dateTimeNow)) && strtotime($relatedEvent->date_start) <= strtotime(self::unQuoteTime($dateTimeMax))) ) &&
+                    (!$checkDecline || ($checkDecline && !self::isDecline($relatedEvent, BeanFactory::getBean('Users', $current_user->id))))
+                ) {
+                    // The original popup/alert reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
+                    $invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '{$popupReminder->id}' AND reminders_invitees.related_invitee_module_id = '{$current_user->id}'");
+                    if($invitees) {
+                        foreach($invitees as $invitee) {
+                            // need to concatenate since GMT times can bridge two local days
+                            $timeStart = strtotime($db->fromConvert(isset($relatedEvent->date_start) ? $relatedEvent->date_start : date(TimeDate::DB_DATETIME_FORMAT), 'datetime'));
+                            $timeRemind = $popupReminder->timer_popup;
+                            $timeStart -= $timeRemind;
+
+                            $url = 'index.php?action=DetailView&module=' . $popupReminder->related_event_module . '&record=' . $popupReminder->related_event_module_id;
+                            $instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
+
+                            if($popupReminder->related_event_module == 'Meetings') {
+                                ///////////////////////////////////////////////////////////////////
+                                ////	MEETING INTEGRATION
+                                if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($popupReminder->related_event_module_id)) {
+                                    $url = $meetingIntegration->miUrlGetJsAlert((array) $popupReminder);
+                                    $instructions = $meetingIntegration->miGetJsAlertInstructions();
+                                }
+                                ////	END MEETING INTEGRATION
+                                ///////////////////////////////////////////////////////////////////								
+                            }
 							
-							$meetingName = from_html(isset($relatedEvent->name) ? $relatedEvent->name : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_EVENT_NAME']);
-							$desc1 = from_html(isset($relatedEvent->description) ? $relatedEvent->description : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_DESCRIPTION']);
-							$location = from_html(isset($relatedEvent->location) ? $relatedEvent->location : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_LOCATION']);
+                            $meetingName = from_html(isset($relatedEvent->name) ? $relatedEvent->name : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_EVENT_NAME']);
+                            $desc1 = from_html(isset($relatedEvent->description) ? $relatedEvent->description : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_DESCRIPTION']);
+                            $location = from_html(isset($relatedEvent->location) ? $relatedEvent->location : $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_LOCATION']);
 							
-							$relatedToMeeting = $alert->getRelatedName($popupReminder->related_event_module, $popupReminder->related_event_module_id);
+                            $relatedToMeeting = $alert->getRelatedName($popupReminder->related_event_module, $popupReminder->related_event_module_id);
 							
-							$description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
-							$description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . (isset($relatedEvent->status) ? $relatedEvent->status : '') ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
-
-
-							if(isset($relatedEvent->date_start)) {
-								$time_dbFromConvert = $db->fromConvert($relatedEvent->date_start, 'datetime');
-								$time = $timedate->to_display_date_time($time_dbFromConvert);
-								if(!$time) {
-									$time = $relatedEvent->date_start;
-								}
-								if(!$time) {
-									$time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
-								}
-							}
-							else {
-								$time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
-							}
-
-							// standard functionality
-							$alert->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
-								$app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$time,
-								$app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
-								$description.
-								$instructions,
-								$timeStart - strtotime($alertDateTimeNow),
-								$url
-							);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private static function unQuoteTime($timestr) {
-		$ret = '';
-		for($i=0; $i<strlen($timestr); $i++) {
-			if($timestr[$i]!="'") $ret .= $timestr[$i];
-		}
-		return $ret;
-	}
+                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
+                            $description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . (isset($relatedEvent->status) ? $relatedEvent->status : '') ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
+
+
+                            if(isset($relatedEvent->date_start)) {
+                                $time_dbFromConvert = $db->fromConvert($relatedEvent->date_start, 'datetime');
+                                $time = $timedate->to_display_date_time($time_dbFromConvert);
+                                if(!$time) {
+                                    $time = $relatedEvent->date_start;
+                                }
+                                if(!$time) {
+                                    $time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
+                                }
+                            }
+                            else {
+                                $time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
+                            }
+
+                            // standard functionality
+                            $alert->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$time,
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
+                                $description.
+                                $instructions,
+                                $timeStart - strtotime($alertDateTimeNow),
+                                $url
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private static function unQuoteTime($timestr) {
+        $ret = '';
+        for($i=0; $i<strlen($timestr); $i++) {
+            if($timestr[$i]!="'") $ret .= $timestr[$i];
+        }
+        return $ret;
+    }
 	
-	// --- test for accept status decline is?
+    // --- test for accept status decline is?
 	
-	private static function isDecline(SugarBean $event, SugarBean $person) {
-		return self::testEventPersonAcceptStatus($event, $person, 'decline');
-	}
+    private static function isDecline(SugarBean $event, SugarBean $person) {
+        return self::testEventPersonAcceptStatus($event, $person, 'decline');
+    }
 	
-	private static function testEventPersonAcceptStatus(SugarBean $event, SugarBean $person, $acceptStatus = 'decline') {
-		if($acceptStats = self::getEventPersonAcceptStatus($event, $person)) {
-			$acceptStatusLower = strtolower($acceptStatus);
-			foreach((array) $acceptStats as $acceptStat) {
-				if(strtolower($acceptStat) == $acceptStatusLower) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
+    private static function testEventPersonAcceptStatus(SugarBean $event, SugarBean $person, $acceptStatus = 'decline') {
+        if($acceptStats = self::getEventPersonAcceptStatus($event, $person)) {
+            $acceptStatusLower = strtolower($acceptStatus);
+            foreach((array) $acceptStats as $acceptStat) {
+                if(strtolower($acceptStat) == $acceptStatusLower) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 	
-	private static function getEventPersonAcceptStatus(SugarBean $event, SugarBean $person) {
-		global $db;
-		$rel_person_table_Key = "rel_{$person->table_name}_table";
-		$rel_person_table_Value = "{$event->table_name}_{$person->table_name}";
-		if(isset($event->$rel_person_table_Key) && $event->$rel_person_table_Key == $rel_person_table_Value) {
-			$query = self::getEventPersonQuery($event, $person);
-			$re = $db->query($query);
-			$ret = array();
-			while($row = $db->fetchByAssoc($re) ) {
-				if(!isset($row['accept_status'])) {
-					return null;
-				}
-				$ret[] = $row['accept_status'];
-			}
-			return $ret;
-		}
-		return null;
-	}
-
-	private function upgradeEventPersonQuery(SugarBean $event, $person_table) {
-		$eventIdField = strtolower($event->object_name).'_id';
-		$query = "
+    private static function getEventPersonAcceptStatus(SugarBean $event, SugarBean $person) {
+        global $db;
+        $rel_person_table_Key = "rel_{$person->table_name}_table";
+        $rel_person_table_Value = "{$event->table_name}_{$person->table_name}";
+        if(isset($event->$rel_person_table_Key) && $event->$rel_person_table_Key == $rel_person_table_Value) {
+            $query = self::getEventPersonQuery($event, $person);
+            $re = $db->query($query);
+            $ret = array();
+            while($row = $db->fetchByAssoc($re) ) {
+                if(!isset($row['accept_status'])) {
+                    return null;
+                }
+                $ret[] = $row['accept_status'];
+            }
+            return $ret;
+        }
+        return null;
+    }
+
+    private function upgradeEventPersonQuery(SugarBean $event, $person_table) {
+        $eventIdField = strtolower($event->object_name).'_id';
+        $query = "
 			SELECT * FROM {$event->table_name}_{$person_table}
 			WHERE
 				{$eventIdField} = '{$event->id}' AND
 				deleted = 0
 		";
-		return $query;
-	}
-
-	private static function getEventPersonQuery(SugarBean $event, SugarBean $person) {
-		$eventIdField = array_search($event->table_name, $event->relationship_fields);
-		if(!$eventIdField) {
-			$eventIdField = strtolower($event->object_name . '_id');
-		}
-		$personIdField = strtolower($person->object_name) . '_id';
-		$query = "
+        return $query;
+    }
+
+    private static function getEventPersonQuery(SugarBean $event, SugarBean $person) {
+        $eventIdField = array_search($event->table_name, $event->relationship_fields);
+        if(!$eventIdField) {
+            $eventIdField = strtolower($event->object_name . '_id');
+        }
+        $personIdField = strtolower($person->object_name) . '_id';
+        $query = "
 			SELECT * FROM {$event->table_name}_{$person->table_name}
 			WHERE
 				{$eventIdField} = '{$event->id}' AND
 				{$personIdField} = '{$person->id}' AND
 				deleted = 0
 		";
-		return $query;
-	}
+        return $query;
+    }
 	
-	// --- user preferences as default values in reminders
-
-	/**
-	 * Default values for Reminders from User Preferences
-	 * @return string JSON encoded default values
-	 * @throws Exception on json_encode error
-	 */
-	public static function loadRemindersDefaultValuesDataJson() {
-		$ret = json_encode(self::loadRemindersDefaultValuesData());
-		if(!$ret && json_last_error()) {
+    // --- user preferences as default values in reminders
+
+    /**
+     * Default values for Reminders from User Preferences
+     * @return string JSON encoded default values
+     * @throws Exception on json_encode error
+     */
+    public static function loadRemindersDefaultValuesDataJson() {
+        $ret = json_encode(self::loadRemindersDefaultValuesData());
+        if(!$ret && json_last_error()) {
             throw new Exception(json_last_error_msg());
         }
-		return $ret;
-	}
+        return $ret;
+    }
 
-	/**
-	 * Default values for Reminders from User Preferences
-	 * @return array default values
-	 */
-	public static function loadRemindersDefaultValuesData() {
-		global $current_user;
-
-		$preferencePopupReminderTime = $current_user->getPreference('reminder_time');
-		$preferenceEmailReminderTime = $current_user->getPreference('email_reminder_time');
-		$preferencePopupReminderChecked = $current_user->getPreference('reminder_checked');
-		$preferenceEmailReminderChecked = $current_user->getPreference('email_reminder_checked');
-
-		return array(
-			'popup' => $preferencePopupReminderChecked,
-			'email' => $preferenceEmailReminderChecked,
-			'timer_popup' => $preferencePopupReminderTime,
-			'timer_email' => $preferenceEmailReminderTime,
-		);
-	}
-
-	// --- upgrade
-
-	/**
-	 * Reminders upgrade, old reminders migrate to multiple-reminders.
-	 * @throws Exception unknown event type or any error
-	 */
-	public static function upgrade() {
-		self::upgradeUserPreferences();
-		self::upgradeEventReminders('Calls');
-		self::upgradeEventReminders('Meetings');
-		self::upgradeRestoreReminders();
-	}
-
-	private static function upgradeRestoreReminders() {
-		if($reminders = BeanFactory::getBean('Reminders')->get_full_list('', 'reminders.deleted = 1')) {
-			foreach($reminders as $reminder) {
-				$reminder->deleted = 0;
-				$reminder->save();
-			}
-		}
-		if($reminderInvitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', 'reminders_invitees.deleted = 1')) {
-			foreach($reminderInvitees as $invitee) {
-				$invitee->deleted = 0;
-				$invitee->save();
-			}
-		}
-		global $db;
-		$q = "UPDATE reminders SET deleted = 0";
-		$db->query($q);
-		$q = "UPDATE reminders_invitees SET deleted = 0";
-		$db->query($q);
-	}
-
-	private static function upgradeUserPreferences() {
-		$users = User::getActiveUsers();
-		foreach($users as $user_id => $user_name) {
-			$user = new User();
-			$user->retrieve($user_id);
-
-			$preferencePopupReminderTime = $user->getPreference('reminder_time');
-			$preferenceEmailReminderTime = $user->getPreference('email_reminder_time');
-
-			$preferencePopupReminderChecked = $preferencePopupReminderTime > -1;
-			$preferenceEmailReminderChecked = $preferenceEmailReminderTime > -1;
-			$user->setPreference('reminder_checked', $preferencePopupReminderChecked);
-			$user->setPreference('email_reminder_checked', $preferenceEmailReminderChecked);
-
-		}
-	}
-
-	/**
-	 * @param string $eventModule 'Calls' or 'Meetings'
-	 */
-	private static function upgradeEventReminders($eventModule) {
-
-		$eventBean = BeanFactory::getBean($eventModule);
-		$events = BeanFactory::getBean($eventModule)->get_full_list('', "{$eventBean->table_name}.date_start >  '2015-11-01 00:00:00' AND ({$eventBean->table_name}.reminder_time != -1 OR ({$eventBean->table_name}.email_reminder_time != -1 AND {$eventBean->table_name}.email_reminder_sent != 1))");
-		if ($events) {
-			foreach ($events as $event) {
-
-				$oldReminderPopupChecked = false;
-				$oldReminderPopupTimer = null;
-				if ($event->reminder_time != -1) {
-					$oldReminderPopupChecked = true;
-					$oldReminderPopupTimer = $event->reminder_time;
-				}
-
-				$oldReminderEmailChecked = false;
-				$oldReminderEmailTimer = null;
-				if ($event->email_reminder_time != -1) {
-					$oldReminderEmailChecked = true;
-					$oldReminderEmailTimer = $event->email_reminder_time;
-				}
-
-				$oldReminderEmailSent = $event->email_reminder_sent;
-
-				if( ($oldInvitees = self::getOldEventInvitees($event)) && ($event->reminder_time != -1 || ($event->email_reminder_time != -1 && $event->email_reminder_sent != 1)) ) {
-
-					self::migrateReminder(
-							$eventModule,
-							$event->id,
-							$oldReminderPopupChecked,
-							$oldReminderPopupTimer,
-							$oldReminderEmailChecked,
-							$oldReminderEmailTimer,
-							$oldReminderEmailSent,
-							$oldInvitees
-					);
-
-				}
-			}
-		}
-
-	}
-
-
-	private static function getOldEventInvitees(SugarBean $event) {
-		global $db;
-		$ret = array();
-		$persons = array('users','contacts','leads');
-		foreach($persons as $person){
-			$query = self::upgradeEventPersonQuery($event, $person);
-			$re = $db->query($query);
-			while($row = $db->fetchByAssoc($re) ) {
-				$ret[] = $row;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * @param string	$eventModule 'Calls' or 'Meetings'
-	 * @param string	$eventModuleId
-	 * @param bool		$oldReminderPopupChecked
-	 * @param int		$oldReminderPopupTimer
-	 * @param bool		$oldReminderEmailChecked
-	 * @param int		$oldReminderEmailTimer
-	 * @param array		$oldInvitees
-	 */
-	private static function migrateReminder($eventModule, $eventModuleId, $oldReminderPopupChecked, $oldReminderPopupTimer, $oldReminderEmailChecked, $oldReminderEmailTimer, $oldReminderEmailSent, $oldInvitees) {
-
-		$reminder = BeanFactory::getBean('Reminders');
-		$reminder->popup = $oldReminderPopupChecked;
-		$reminder->email = $oldReminderEmailChecked;
-		$reminder->email_sent = $oldReminderEmailSent;
-		$reminder->timer_popup = $oldReminderPopupTimer;
-		$reminder->timer_email = $oldReminderEmailTimer;
-		$reminder->related_event_module = $eventModule;
-		$reminder->related_event_module_id = $eventModuleId;
-		$reminder->save();
-		$reminderId = $reminder->id;
-		self::migrateReminderInvitees($reminderId, $oldInvitees);
-
-		self::removeOldReminder($eventModule, $eventModuleId);
-	}
-
-	private static function migrateReminderInvitees($reminderId, $invitees) {
-		$ret = array();
-		foreach((array) $invitees as $invitee) {
-			$newInvitee = BeanFactory::getBean('Reminders_Invitees');
-			$newInvitee->reminder_id = $reminderId;
-			$newInvitee->related_invitee_module = self::getRelatedInviteeModuleFromInviteeArray($invitee);
-			$newInvitee->related_invitee_module_id = self::getRelatedInviteeModuleIdFromInviteeArray($invitee);
-			$newInvitee->save();
-		}
-		return $ret;
-	}
-
-	private static function getRelatedInviteeModuleFromInviteeArray($invitee) {
-		if(array_key_exists('user_id', $invitee)) {
-			return 'Users';
-		}
-		if(array_key_exists('lead_id', $invitee)) {
-			return 'Leads';
-		}
-		if(array_key_exists('contact_id', $invitee)) {
-			return 'Contacts';
-		}
-		// TODO:!!!!
-		throw new Exception('Unknown invitee module type');
-		//return null;
-	}
-
-	private static function getRelatedInviteeModuleIdFromInviteeArray($invitee) {
-		if(array_key_exists('user_id', $invitee)) {
-			return $invitee['user_id'];
-		}
-		if(array_key_exists('lead_id', $invitee)) {
-			return $invitee['lead_id'];
-		}
-		if(array_key_exists('contact_id', $invitee)) {
-			return $invitee['contact_id'];
-		}
-		// TODO:!!!!
-		throw new Exception('Unknown invitee type');
-		//return null;
-	}
-
-	/**
-	 * @param string	$eventModule 'Calls' or 'Meetings'
-	 * @param string	$eventModuleId
-	 */
-	private static function removeOldReminder($eventModule, $eventModuleId) {
-		$event = BeanFactory::getBean($eventModule, $eventModuleId);
-		$event->reminder_time = -1;
-		$event->email_reminder_time = -1;
-		$event->email_reminder_sent = 0;
-		$event->save();
-	}
-
-	// --- reminders list on detail views
-
-	/**
-	 * Return a list of related reminders for specified event (Calls/Meetings). Call it from DetailViews.
-	 * @param SugarBean $event a Call or Meeting Bean
-	 * @return mixed|string|void output of list (html)
-	 * @throws Exception on json error in Remainders
-	 */
-	public static function getRemindersListView(SugarBean $event) {
-		global $mod_strings, $app_list_strings;
-		$tpl = new Sugar_Smarty();
-		$tpl->assign('MOD', $mod_strings);
-		$tpl->assign('reminder_time_options', $app_list_strings['reminder_time_options']);
-		$tpl->assign('remindersData', Reminder::loadRemindersData($event->module_name, $event->id));
-		$tpl->assign('remindersDataJson', Reminder::loadRemindersDataJson($event->module_name, $event->id));
-		$tpl->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
-		$tpl->assign('remindersDisabled', json_encode(true));
-		return $tpl->fetch('modules/Reminders/tpls/reminders.tpl');
-	}
-
-	/*
+    /**
+     * Default values for Reminders from User Preferences
+     * @return array default values
+     */
+    public static function loadRemindersDefaultValuesData() {
+        global $current_user;
+
+        $preferencePopupReminderTime = $current_user->getPreference('reminder_time');
+        $preferenceEmailReminderTime = $current_user->getPreference('email_reminder_time');
+        $preferencePopupReminderChecked = $current_user->getPreference('reminder_checked');
+        $preferenceEmailReminderChecked = $current_user->getPreference('email_reminder_checked');
+
+        return array(
+            'popup' => $preferencePopupReminderChecked,
+            'email' => $preferenceEmailReminderChecked,
+            'timer_popup' => $preferencePopupReminderTime,
+            'timer_email' => $preferenceEmailReminderTime,
+        );
+    }
+
+    // --- upgrade
+
+    /**
+     * Reminders upgrade, old reminders migrate to multiple-reminders.
+     * @throws Exception unknown event type or any error
+     */
+    public static function upgrade() {
+        self::upgradeUserPreferences();
+        self::upgradeEventReminders('Calls');
+        self::upgradeEventReminders('Meetings');
+        self::upgradeRestoreReminders();
+    }
+
+    private static function upgradeRestoreReminders() {
+        if($reminders = BeanFactory::getBean('Reminders')->get_full_list('', 'reminders.deleted = 1')) {
+            foreach($reminders as $reminder) {
+                $reminder->deleted = 0;
+                $reminder->save();
+            }
+        }
+        if($reminderInvitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', 'reminders_invitees.deleted = 1')) {
+            foreach($reminderInvitees as $invitee) {
+                $invitee->deleted = 0;
+                $invitee->save();
+            }
+        }
+        global $db;
+        $q = "UPDATE reminders SET deleted = 0";
+        $db->query($q);
+        $q = "UPDATE reminders_invitees SET deleted = 0";
+        $db->query($q);
+    }
+
+    private static function upgradeUserPreferences() {
+        $users = User::getActiveUsers();
+        foreach($users as $user_id => $user_name) {
+            $user = new User();
+            $user->retrieve($user_id);
+
+            $preferencePopupReminderTime = $user->getPreference('reminder_time');
+            $preferenceEmailReminderTime = $user->getPreference('email_reminder_time');
+
+            $preferencePopupReminderChecked = $preferencePopupReminderTime > -1;
+            $preferenceEmailReminderChecked = $preferenceEmailReminderTime > -1;
+            $user->setPreference('reminder_checked', $preferencePopupReminderChecked);
+            $user->setPreference('email_reminder_checked', $preferenceEmailReminderChecked);
+
+        }
+    }
+
+    /**
+     * @param string $eventModule 'Calls' or 'Meetings'
+     */
+    private static function upgradeEventReminders($eventModule) {
+
+        $eventBean = BeanFactory::getBean($eventModule);
+        $events = BeanFactory::getBean($eventModule)->get_full_list('', "{$eventBean->table_name}.date_start >  '2015-11-01 00:00:00' AND ({$eventBean->table_name}.reminder_time != -1 OR ({$eventBean->table_name}.email_reminder_time != -1 AND {$eventBean->table_name}.email_reminder_sent != 1))");
+        if ($events) {
+            foreach ($events as $event) {
+
+                $oldReminderPopupChecked = false;
+                $oldReminderPopupTimer = null;
+                if ($event->reminder_time != -1) {
+                    $oldReminderPopupChecked = true;
+                    $oldReminderPopupTimer = $event->reminder_time;
+                }
+
+                $oldReminderEmailChecked = false;
+                $oldReminderEmailTimer = null;
+                if ($event->email_reminder_time != -1) {
+                    $oldReminderEmailChecked = true;
+                    $oldReminderEmailTimer = $event->email_reminder_time;
+                }
+
+                $oldReminderEmailSent = $event->email_reminder_sent;
+
+                if( ($oldInvitees = self::getOldEventInvitees($event)) && ($event->reminder_time != -1 || ($event->email_reminder_time != -1 && $event->email_reminder_sent != 1)) ) {
+
+                    self::migrateReminder(
+                            $eventModule,
+                            $event->id,
+                            $oldReminderPopupChecked,
+                            $oldReminderPopupTimer,
+                            $oldReminderEmailChecked,
+                            $oldReminderEmailTimer,
+                            $oldReminderEmailSent,
+                            $oldInvitees
+                    );
+
+                }
+            }
+        }
+
+    }
+
+
+    private static function getOldEventInvitees(SugarBean $event) {
+        global $db;
+        $ret = array();
+        $persons = array('users','contacts','leads');
+        foreach($persons as $person){
+            $query = self::upgradeEventPersonQuery($event, $person);
+            $re = $db->query($query);
+            while($row = $db->fetchByAssoc($re) ) {
+                $ret[] = $row;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * @param string	$eventModule 'Calls' or 'Meetings'
+     * @param string	$eventModuleId
+     * @param bool		$oldReminderPopupChecked
+     * @param int		$oldReminderPopupTimer
+     * @param bool		$oldReminderEmailChecked
+     * @param int		$oldReminderEmailTimer
+     * @param array		$oldInvitees
+     */
+    private static function migrateReminder($eventModule, $eventModuleId, $oldReminderPopupChecked, $oldReminderPopupTimer, $oldReminderEmailChecked, $oldReminderEmailTimer, $oldReminderEmailSent, $oldInvitees) {
+
+        $reminder = BeanFactory::getBean('Reminders');
+        $reminder->popup = $oldReminderPopupChecked;
+        $reminder->email = $oldReminderEmailChecked;
+        $reminder->email_sent = $oldReminderEmailSent;
+        $reminder->timer_popup = $oldReminderPopupTimer;
+        $reminder->timer_email = $oldReminderEmailTimer;
+        $reminder->related_event_module = $eventModule;
+        $reminder->related_event_module_id = $eventModuleId;
+        $reminder->save();
+        $reminderId = $reminder->id;
+        self::migrateReminderInvitees($reminderId, $oldInvitees);
+
+        self::removeOldReminder($eventModule, $eventModuleId);
+    }
+
+    private static function migrateReminderInvitees($reminderId, $invitees) {
+        $ret = array();
+        foreach((array) $invitees as $invitee) {
+            $newInvitee = BeanFactory::getBean('Reminders_Invitees');
+            $newInvitee->reminder_id = $reminderId;
+            $newInvitee->related_invitee_module = self::getRelatedInviteeModuleFromInviteeArray($invitee);
+            $newInvitee->related_invitee_module_id = self::getRelatedInviteeModuleIdFromInviteeArray($invitee);
+            $newInvitee->save();
+        }
+        return $ret;
+    }
+
+    private static function getRelatedInviteeModuleFromInviteeArray($invitee) {
+        if(array_key_exists('user_id', $invitee)) {
+            return 'Users';
+        }
+        if(array_key_exists('lead_id', $invitee)) {
+            return 'Leads';
+        }
+        if(array_key_exists('contact_id', $invitee)) {
+            return 'Contacts';
+        }
+        // TODO:!!!!
+        throw new Exception('Unknown invitee module type');
+        //return null;
+    }
+
+    private static function getRelatedInviteeModuleIdFromInviteeArray($invitee) {
+        if(array_key_exists('user_id', $invitee)) {
+            return $invitee['user_id'];
+        }
+        if(array_key_exists('lead_id', $invitee)) {
+            return $invitee['lead_id'];
+        }
+        if(array_key_exists('contact_id', $invitee)) {
+            return $invitee['contact_id'];
+        }
+        // TODO:!!!!
+        throw new Exception('Unknown invitee type');
+        //return null;
+    }
+
+    /**
+     * @param string	$eventModule 'Calls' or 'Meetings'
+     * @param string	$eventModuleId
+     */
+    private static function removeOldReminder($eventModule, $eventModuleId) {
+        $event = BeanFactory::getBean($eventModule, $eventModuleId);
+        $event->reminder_time = -1;
+        $event->email_reminder_time = -1;
+        $event->email_reminder_sent = 0;
+        $event->save();
+    }
+
+    // --- reminders list on detail views
+
+    /**
+     * Return a list of related reminders for specified event (Calls/Meetings). Call it from DetailViews.
+     * @param SugarBean $event a Call or Meeting Bean
+     * @return mixed|string|void output of list (html)
+     * @throws Exception on json error in Remainders
+     */
+    public static function getRemindersListView(SugarBean $event) {
+        global $mod_strings, $app_list_strings;
+        $tpl = new Sugar_Smarty();
+        $tpl->assign('MOD', $mod_strings);
+        $tpl->assign('reminder_time_options', $app_list_strings['reminder_time_options']);
+        $tpl->assign('remindersData', Reminder::loadRemindersData($event->module_name, $event->id));
+        $tpl->assign('remindersDataJson', Reminder::loadRemindersDataJson($event->module_name, $event->id));
+        $tpl->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
+        $tpl->assign('remindersDisabled', json_encode(true));
+        return $tpl->fetch('modules/Reminders/tpls/reminders.tpl');
+    }
+
+    /*
 	 * @todo implenent it
 	 */
-	public static function getRemindersListInlineEditView(SugarBean $event) {
-		// TODO: getEditFieldHTML() function in InlineEditing.php:218 doesn't pass the Bean ID to this custom inline edit view function but we have to know which Bean are in the focus to editing.
-		if(!$event->id) {
-			throw new Exception("No GUID for edit.");
-		}
-	}
+    public static function getRemindersListInlineEditView(SugarBean $event) {
+        // TODO: getEditFieldHTML() function in InlineEditing.php:218 doesn't pass the Bean ID to this custom inline edit view function but we have to know which Bean are in the focus to editing.
+        if(!$event->id) {
+            throw new Exception("No GUID for edit.");
+        }
+    }
 
 }
 ?>
\ No newline at end of file

Spacing +64 added lines, -64 removed lines

@@ -69,8 +69,8 @@ 
         parent::Basic();
     }
 
-    public function bean_implements($interface){
-        switch($interface){
+    public function bean_implements($interface) {
+        switch ($interface) {
             case 'ACL': return true;
         }
         return false;
@@ -89,7 +89,7 @@ 
 	 */
     public static function saveRemindersDataJson($eventModule, $eventModuleId, $remindersDataJson) {
         $reminderData = json_decode($remindersDataJson);
-        if(!json_last_error()) {
+        if (!json_last_error()) {
             Reminder::saveRemindersData($eventModule, $eventModuleId, $reminderData);
         }
         else {
@@ -99,8 +99,8 @@ 
 	
     private static function saveRemindersData($eventModule, $eventModuleId, $remindersData) {
         $savedReminderIds = array();
-        foreach($remindersData as $reminderData) {
-			if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $reminderData->id = '';
+        foreach ($remindersData as $reminderData) {
+			if (isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $reminderData->id = '';
             $reminderBean = BeanFactory::getBean('Reminders', $reminderData->id);
             $reminderBean->popup = $reminderData->popup;
             $reminderBean->email = $reminderData->email;
@@ -114,7 +114,7 @@ 
             Reminder_Invitee::saveRemindersInviteesData($reminderId, $reminderData->invitees);
         }
         $reminders = BeanFactory::getBean('Reminders')->get_full_list("", "reminders.related_event_module = '$eventModule' AND reminders.related_event_module_id = '$eventModuleId'");
-        if($reminders) {
+        if ($reminders) {
             foreach ($reminders as $reminder) {
                 if (!in_array($reminder->id, $savedReminderIds)) {
                     Reminder_Invitee::deleteRemindersInviteesMultiple($reminder->id);
@@ -138,7 +138,7 @@ 
     public static function loadRemindersDataJson($eventModule, $eventModuleId, $isDuplicate = false) {
         $remindersData = self::loadRemindersData($eventModule, $eventModuleId, $isDuplicate);
         $remindersDataJson = json_encode($remindersData);
-        if(!$remindersDataJson && json_last_error()) {
+        if (!$remindersDataJson && json_last_error()) {
             throw new Exception(json_last_error_msg());
         }
         return $remindersDataJson;
@@ -154,7 +154,7 @@ 
 	 * @throws Exception
 	 */
 	public static function loadRemindersData($eventModule, $eventModuleId, $isDuplicate = false) {
-		if(!isset(self::$remindersData[$eventModule][$eventModuleId]) || !$eventModuleId || $isDuplicate) {
+		if (!isset(self::$remindersData[$eventModule][$eventModuleId]) || !$eventModuleId || $isDuplicate) {
 			$ret = array();
 			$reminders = BeanFactory::getBean('Reminders')->get_full_list("reminders.date_entered", "reminders.related_event_module = '$eventModule' AND reminders.related_event_module_id = '$eventModuleId'");
 			if ($reminders) {
@@ -185,11 +185,11 @@ 
 	 * @param boolean $checkDecline (optional) Send email if user accept status is not decline. Default is TRUE.
 	 */
 	public static function sendEmailReminders(EmailReminder $emailReminder, Administration $admin, $checkDecline = true) {
-        if($reminders = self::getUnsentEmailReminders()) {
-            foreach($reminders as $reminderId => $reminder) {
+        if ($reminders = self::getUnsentEmailReminders()) {
+            foreach ($reminders as $reminderId => $reminder) {
 				$recipients = self::getEmailReminderInviteesRecipients($reminderId, $checkDecline);
 				$eventBean = BeanFactory::getBean($reminder->related_event_module, $reminder->related_event_module_id);
-				if ( $emailReminder->sendReminders($eventBean, $admin, $recipients) ) {
+				if ($emailReminder->sendReminders($eventBean, $admin, $recipients)) {
 					$reminder->email_sent = 1;
 					$reminder->save();
 				}
@@ -203,15 +203,15 @@ 
 		$eventModule = $reminder->related_event_module;
 		$eventModuleId = $reminder->related_event_module_id;		
 		$event = BeanFactory::getBean($eventModule, $eventModuleId);
-		if(!isset($event->status) || $event->status != 'Held') {
+		if (!isset($event->status) || $event->status != 'Held') {
 			$invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '$reminderId'");
-			foreach($invitees as $invitee) {
+			foreach ($invitees as $invitee) {
 				$inviteeModule = $invitee->related_invitee_module;
 				$inviteeModuleId = $invitee->related_invitee_module_id;
 				$personBean = BeanFactory::getBean($inviteeModule, $inviteeModuleId);
 				// The original email reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
-				if($checkDecline && !self::isDecline($event, $personBean)) {
-					if ( !empty($personBean->email1) ) {
+				if ($checkDecline && !self::isDecline($event, $personBean)) {
+					if (!empty($personBean->email1)) {
 						$arr = array(
 							'type' => $inviteeModule,
 							'name' => $personBean->full_name,
@@ -229,14 +229,14 @@ 
         global $db;
 		$reminders = array();
 		$reminderBeans = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.email = 1 AND reminders.email_sent = 0");
-		foreach($reminderBeans as $reminderBean) {
+		foreach ($reminderBeans as $reminderBean) {
 			$eventBean = BeanFactory::getBean($reminderBean->related_event_module, $reminderBean->related_event_module_id);
 			$dateStart = $eventBean->date_start;
-			$time = strtotime($db->fromConvert($dateStart,'datetime'));
+			$time = strtotime($db->fromConvert($dateStart, 'datetime'));
 			$dateStart = date(TimeDate::DB_DATETIME_FORMAT, $time);
-			$remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($dateStart,'datetime'))->modify("-{$reminderBean->timer_email} seconds")->ts;
+			$remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($dateStart, 'datetime'))->modify("-{$reminderBean->timer_email} seconds")->ts;
             $now_ts = $GLOBALS['timedate']->getNow()->ts;
-            if ( $now_ts >= $remind_ts ) {
+            if ($now_ts >= $remind_ts) {
                 $reminders[$reminderBean->id] = $reminderBean;
             }
 		}
@@ -281,8 +281,8 @@ 
 		///////////////////////////////////////////////////////////////////////
 		////	MEETING INTEGRATION
 		$meetingIntegration = null;
-		if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
-			if(!class_exists($sugar_config['meeting_integration'])) {
+		if (isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
+			if (!class_exists($sugar_config['meeting_integration'])) {
 				require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
 			}
 			$meetingIntegration = new $sugar_config['meeting_integration']();
@@ -292,31 +292,31 @@ 
 		
 		$popupReminders = BeanFactory::getBean('Reminders')->get_full_list('', "reminders.popup = 1");
 
-		if($popupReminders) {
-			foreach($popupReminders as $popupReminder) {
+		if ($popupReminders) {
+			foreach ($popupReminders as $popupReminder) {
 				$relatedEvent = BeanFactory::getBean($popupReminder->related_event_module, $popupReminder->related_event_module_id);
-				if( $relatedEvent &&
+				if ($relatedEvent &&
 					(!isset($relatedEvent->status) || $relatedEvent->status == 'Planned') &&
-					(!isset($relatedEvent->date_start) || (strtotime($relatedEvent->date_start) >= strtotime(self::unQuoteTime($dateTimeNow)) && strtotime($relatedEvent->date_start) <= strtotime(self::unQuoteTime($dateTimeMax))) ) &&
+					(!isset($relatedEvent->date_start) || (strtotime($relatedEvent->date_start) >= strtotime(self::unQuoteTime($dateTimeNow)) && strtotime($relatedEvent->date_start) <= strtotime(self::unQuoteTime($dateTimeMax)))) &&
 					(!$checkDecline || ($checkDecline && !self::isDecline($relatedEvent, BeanFactory::getBean('Users', $current_user->id))))
 				) {
 					// The original popup/alert reminders check the accept_status field in related users/leads/contacts etc. and filtered these users who not decline this event.
 					$invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', "reminders_invitees.reminder_id = '{$popupReminder->id}' AND reminders_invitees.related_invitee_module_id = '{$current_user->id}'");
-					if($invitees) {
-						foreach($invitees as $invitee) {
+					if ($invitees) {
+						foreach ($invitees as $invitee) {
 							// need to concatenate since GMT times can bridge two local days
 							$timeStart = strtotime($db->fromConvert(isset($relatedEvent->date_start) ? $relatedEvent->date_start : date(TimeDate::DB_DATETIME_FORMAT), 'datetime'));
 							$timeRemind = $popupReminder->timer_popup;
 							$timeStart -= $timeRemind;
 
-							$url = 'index.php?action=DetailView&module=' . $popupReminder->related_event_module . '&record=' . $popupReminder->related_event_module_id;
+							$url = 'index.php?action=DetailView&module='.$popupReminder->related_event_module.'&record='.$popupReminder->related_event_module_id;
 							$instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
 
-							if($popupReminder->related_event_module == 'Meetings') {
+							if ($popupReminder->related_event_module == 'Meetings') {
 								///////////////////////////////////////////////////////////////////
 								////	MEETING INTEGRATION
-								if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($popupReminder->related_event_module_id)) {
-									$url = $meetingIntegration->miUrlGetJsAlert((array) $popupReminder);
+								if (!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($popupReminder->related_event_module_id)) {
+									$url = $meetingIntegration->miUrlGetJsAlert((array)$popupReminder);
 									$instructions = $meetingIntegration->miGetJsAlertInstructions();
 								}
 								////	END MEETING INTEGRATION
@@ -330,16 +330,16 @@ 
 							$relatedToMeeting = $alert->getRelatedName($popupReminder->related_event_module, $popupReminder->related_event_module_id);
 							
 							$description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
-							$description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . (isset($relatedEvent->status) ? $relatedEvent->status : '') ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
+							$description = $description."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'].(isset($relatedEvent->status) ? $relatedEvent->status : '')."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'].$relatedToMeeting;
 
 
-							if(isset($relatedEvent->date_start)) {
+							if (isset($relatedEvent->date_start)) {
 								$time_dbFromConvert = $db->fromConvert($relatedEvent->date_start, 'datetime');
 								$time = $timedate->to_display_date_time($time_dbFromConvert);
-								if(!$time) {
+								if (!$time) {
 									$time = $relatedEvent->date_start;
 								}
-								if(!$time) {
+								if (!$time) {
 									$time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
 								}
 							}
@@ -365,8 +365,8 @@ 
 
 	private static function unQuoteTime($timestr) {
 		$ret = '';
-		for($i=0; $i<strlen($timestr); $i++) {
-			if($timestr[$i]!="'") $ret .= $timestr[$i];
+		for ($i = 0; $i < strlen($timestr); $i++) {
+			if ($timestr[$i] != "'") $ret .= $timestr[$i];
 		}
 		return $ret;
 	}
@@ -378,10 +378,10 @@ 
 	}
 	
 	private static function testEventPersonAcceptStatus(SugarBean $event, SugarBean $person, $acceptStatus = 'decline') {
-		if($acceptStats = self::getEventPersonAcceptStatus($event, $person)) {
+		if ($acceptStats = self::getEventPersonAcceptStatus($event, $person)) {
 			$acceptStatusLower = strtolower($acceptStatus);
-			foreach((array) $acceptStats as $acceptStat) {
-				if(strtolower($acceptStat) == $acceptStatusLower) {
+			foreach ((array)$acceptStats as $acceptStat) {
+				if (strtolower($acceptStat) == $acceptStatusLower) {
 					return true;
 				}
 			}
@@ -393,12 +393,12 @@ 
 		global $db;
 		$rel_person_table_Key = "rel_{$person->table_name}_table";
 		$rel_person_table_Value = "{$event->table_name}_{$person->table_name}";
-		if(isset($event->$rel_person_table_Key) && $event->$rel_person_table_Key == $rel_person_table_Value) {
+		if (isset($event->$rel_person_table_Key) && $event->$rel_person_table_Key == $rel_person_table_Value) {
 			$query = self::getEventPersonQuery($event, $person);
 			$re = $db->query($query);
 			$ret = array();
-			while($row = $db->fetchByAssoc($re) ) {
-				if(!isset($row['accept_status'])) {
+			while ($row = $db->fetchByAssoc($re)) {
+				if (!isset($row['accept_status'])) {
 					return null;
 				}
 				$ret[] = $row['accept_status'];
@@ -421,10 +421,10 @@ 
 
 	private static function getEventPersonQuery(SugarBean $event, SugarBean $person) {
 		$eventIdField = array_search($event->table_name, $event->relationship_fields);
-		if(!$eventIdField) {
-			$eventIdField = strtolower($event->object_name . '_id');
+		if (!$eventIdField) {
+			$eventIdField = strtolower($event->object_name.'_id');
 		}
-		$personIdField = strtolower($person->object_name) . '_id';
+		$personIdField = strtolower($person->object_name).'_id';
 		$query = "
 			SELECT * FROM {$event->table_name}_{$person->table_name}
 			WHERE
@@ -444,7 +444,7 @@ 
 	 */
 	public static function loadRemindersDefaultValuesDataJson() {
 		$ret = json_encode(self::loadRemindersDefaultValuesData());
-		if(!$ret && json_last_error()) {
+		if (!$ret && json_last_error()) {
             throw new Exception(json_last_error_msg());
         }
 		return $ret;
@@ -484,14 +484,14 @@ 
 	}
 
 	private static function upgradeRestoreReminders() {
-		if($reminders = BeanFactory::getBean('Reminders')->get_full_list('', 'reminders.deleted = 1')) {
-			foreach($reminders as $reminder) {
+		if ($reminders = BeanFactory::getBean('Reminders')->get_full_list('', 'reminders.deleted = 1')) {
+			foreach ($reminders as $reminder) {
 				$reminder->deleted = 0;
 				$reminder->save();
 			}
 		}
-		if($reminderInvitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', 'reminders_invitees.deleted = 1')) {
-			foreach($reminderInvitees as $invitee) {
+		if ($reminderInvitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list('', 'reminders_invitees.deleted = 1')) {
+			foreach ($reminderInvitees as $invitee) {
 				$invitee->deleted = 0;
 				$invitee->save();
 			}
@@ -505,7 +505,7 @@ 
 
 	private static function upgradeUserPreferences() {
 		$users = User::getActiveUsers();
-		foreach($users as $user_id => $user_name) {
+		foreach ($users as $user_id => $user_name) {
 			$user = new User();
 			$user->retrieve($user_id);
 
@@ -546,7 +546,7 @@ 
 
 				$oldReminderEmailSent = $event->email_reminder_sent;
 
-				if( ($oldInvitees = self::getOldEventInvitees($event)) && ($event->reminder_time != -1 || ($event->email_reminder_time != -1 && $event->email_reminder_sent != 1)) ) {
+				if (($oldInvitees = self::getOldEventInvitees($event)) && ($event->reminder_time != -1 || ($event->email_reminder_time != -1 && $event->email_reminder_sent != 1))) {
 
 					self::migrateReminder(
 							$eventModule,
@@ -569,11 +569,11 @@ 
 	private static function getOldEventInvitees(SugarBean $event) {
 		global $db;
 		$ret = array();
-		$persons = array('users','contacts','leads');
-		foreach($persons as $person){
+		$persons = array('users', 'contacts', 'leads');
+		foreach ($persons as $person) {
 			$query = self::upgradeEventPersonQuery($event, $person);
 			$re = $db->query($query);
-			while($row = $db->fetchByAssoc($re) ) {
+			while ($row = $db->fetchByAssoc($re)) {
 				$ret[] = $row;
 			}
 		}
@@ -608,7 +608,7 @@ 
 
 	private static function migrateReminderInvitees($reminderId, $invitees) {
 		$ret = array();
-		foreach((array) $invitees as $invitee) {
+		foreach ((array)$invitees as $invitee) {
 			$newInvitee = BeanFactory::getBean('Reminders_Invitees');
 			$newInvitee->reminder_id = $reminderId;
 			$newInvitee->related_invitee_module = self::getRelatedInviteeModuleFromInviteeArray($invitee);
@@ -619,13 +619,13 @@ 
 	}
 
 	private static function getRelatedInviteeModuleFromInviteeArray($invitee) {
-		if(array_key_exists('user_id', $invitee)) {
+		if (array_key_exists('user_id', $invitee)) {
 			return 'Users';
 		}
-		if(array_key_exists('lead_id', $invitee)) {
+		if (array_key_exists('lead_id', $invitee)) {
 			return 'Leads';
 		}
-		if(array_key_exists('contact_id', $invitee)) {
+		if (array_key_exists('contact_id', $invitee)) {
 			return 'Contacts';
 		}
 		// TODO:!!!!
@@ -634,13 +634,13 @@ 
 	}
 
 	private static function getRelatedInviteeModuleIdFromInviteeArray($invitee) {
-		if(array_key_exists('user_id', $invitee)) {
+		if (array_key_exists('user_id', $invitee)) {
 			return $invitee['user_id'];
 		}
-		if(array_key_exists('lead_id', $invitee)) {
+		if (array_key_exists('lead_id', $invitee)) {
 			return $invitee['lead_id'];
 		}
-		if(array_key_exists('contact_id', $invitee)) {
+		if (array_key_exists('contact_id', $invitee)) {
 			return $invitee['contact_id'];
 		}
 		// TODO:!!!!
@@ -685,7 +685,7 @@ 
 	 */
 	public static function getRemindersListInlineEditView(SugarBean $event) {
 		// TODO: getEditFieldHTML() function in InlineEditing.php:218 doesn't pass the Bean ID to this custom inline edit view function but we have to know which Bean are in the focus to editing.
-		if(!$event->id) {
+		if (!$event->id) {
 			throw new Exception("No GUID for edit.");
 		}
 	}

Braces +8 added lines, -6 removed lines

@@ -91,8 +91,7 @@ 
         $reminderData = json_decode($remindersDataJson);
         if(!json_last_error()) {
             Reminder::saveRemindersData($eventModule, $eventModuleId, $reminderData);
-        }
-        else {
+        } else {
             throw new Exception(json_last_error_msg());
         }
     }
@@ -100,7 +99,9 @@ 
     private static function saveRemindersData($eventModule, $eventModuleId, $remindersData) {
         $savedReminderIds = array();
         foreach($remindersData as $reminderData) {
-			if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $reminderData->id = '';
+			if(isset($_POST['isDuplicate']) && $_POST['isDuplicate']) {
+			    $reminderData->id = '';
+			}
             $reminderBean = BeanFactory::getBean('Reminders', $reminderData->id);
             $reminderBean->popup = $reminderData->popup;
             $reminderBean->email = $reminderData->email;
@@ -342,8 +343,7 @@ 
 								if(!$time) {
 									$time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
 								}
-							}
-							else {
+							} else {
 								$time = $app_strings['MSG_JS_ALERT_MTG_REMINDER_NO_START_DATE'];
 							}
 
@@ -366,7 +366,9 @@ 
 	private static function unQuoteTime($timestr) {
 		$ret = '';
 		for($i=0; $i<strlen($timestr); $i++) {
-			if($timestr[$i]!="'") $ret .= $timestr[$i];
+			if($timestr[$i]!="'") {
+			    $ret .= $timestr[$i];
+			}
 		}
 		return $ret;
 	}

Doc Comments +10 added lines

@@ -97,6 +97,10 @@ 
         }
     }
 	
+    /**
+     * @param string $eventModule
+     * @param string $eventModuleId
+     */
     private static function saveRemindersData($eventModule, $eventModuleId, $remindersData) {
         $savedReminderIds = array();
         foreach($remindersData as $reminderData) {
@@ -408,6 +412,9 @@ 
 		return null;
 	}
 
+	/**
+	 * @param string $person_table
+	 */
 	private function upgradeEventPersonQuery(SugarBean $event, $person_table) {
 		$eventIdField = strtolower($event->object_name).'_id';
 		$query = "
@@ -606,6 +613,9 @@ 
 		self::removeOldReminder($eventModule, $eventModuleId);
 	}
 
+	/**
+	 * @param string $reminderId
+	 */
 	private static function migrateReminderInvitees($reminderId, $invitees) {
 		$ret = array();
 		foreach((array) $invitees as $invitee) {

modules/Documents/GetLatestRevision.php

Indentation +6 added lines, -6 removed lines

@@ -45,12 +45,12 @@
 require_once('include/formbase.php');
 if (!empty($_REQUEST['record'])) {
 
-	$document = new Document();
-	$document->retrieve($_REQUEST['record']);
-	if (!empty($document->document_revision_id) && !empty($_REQUEST['get_latest_for_id']))  {
-		$query="update linked_documents set document_revision_id='{$document->document_revision_id}', date_modified='".TimeDate::getInstance()->nowDb()."' where id ='{$_REQUEST['get_latest_for_id']}' ";
-		$document->db->query($query);
-	}	
+    $document = new Document();
+    $document->retrieve($_REQUEST['record']);
+    if (!empty($document->document_revision_id) && !empty($_REQUEST['get_latest_for_id']))  {
+        $query="update linked_documents set document_revision_id='{$document->document_revision_id}', date_modified='".TimeDate::getInstance()->nowDb()."' where id ='{$_REQUEST['get_latest_for_id']}' ";
+        $document->db->query($query);
+    }	
 }
 handleRedirect();
 ?>

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,8 +47,8 @@ 
 
 	$document = new Document();
 	$document->retrieve($_REQUEST['record']);
-	if (!empty($document->document_revision_id) && !empty($_REQUEST['get_latest_for_id']))  {
-		$query="update linked_documents set document_revision_id='{$document->document_revision_id}', date_modified='".TimeDate::getInstance()->nowDb()."' where id ='{$_REQUEST['get_latest_for_id']}' ";
+	if (!empty($document->document_revision_id) && !empty($_REQUEST['get_latest_for_id'])) {
+		$query = "update linked_documents set document_revision_id='{$document->document_revision_id}', date_modified='".TimeDate::getInstance()->nowDb()."' where id ='{$_REQUEST['get_latest_for_id']}' ";
 		$document->db->query($query);
 	}	
 }

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.