adamjakab / SuiteCRM

modules/Calls/metadata/detailviewdefs.php

Indentation +97 added lines, -97 removed lines

@@ -40,150 +40,150 @@ 
 
 $viewdefs ['Calls'] =
 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' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSaveAndNew" value="false">  <input type="hidden" name="status" value="">  <input type="hidden" name="isSaveFromDetailView" value="true">  <input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"   class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Calls\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'" id="close_create_button" name="button"  value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"  type="submit">{/if}',
             'sugar_html' => 
             array (
-              'type' => 'submit',
-              'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
-              'htmlOptions' => 
-              array (
+                'type' => 'submit',
+                'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
+                'htmlOptions' => 
+                array (
                 'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
                 'class' => 'button',
                 'onclick' => 'this.form.isSaveFromDetailView.value=true; this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Calls\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'',
                 'name' => 'button',
                 'id' => 'close_create_button',
-              ),
-              'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
+                ),
+                'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
+            ),
             ),
-          ),
-          4 => 
-          array (
+            4 => 
+            array (
             'customCode' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSave" value="false">  <input title="{$APP.LBL_CLOSE_BUTTON_TITLE}"  accesskey="{$APP.LBL_CLOSE_BUTTON_KEY}"  class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Calls\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'" id="close_button" name="button1"  value="{$APP.LBL_CLOSE_BUTTON_TITLE}"  type="submit">{/if}',
             'sugar_html' => 
             array (
-              'type' => 'submit',
-              'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
-              'htmlOptions' => 
-              array (
+                'type' => 'submit',
+                'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
+                'htmlOptions' => 
+                array (
                 'title' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
                 'accesskey' => '{$APP.LBL_CLOSE_BUTTON_KEY}',
                 'class' => 'button',
                 'onclick' => 'this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Calls\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';this.form.isSaveFromDetailView.value=true',
                 'name' => 'button1',
                 'id' => 'close_button',
-              ),
-              'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
+                ),
+                'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
+            ),
             ),
-          ),
-          'SA_RESCHEDULE' => 
-          array (
+            'SA_RESCHEDULE' => 
+            array (
             'customCode' => '{if $fields.status.value != "Held"} <input title="{$MOD.LBL_RESCHEDULE}" class="button" onclick="get_form();" name="Reschedule" id="reschedule_button" value="{$MOD.LBL_RESCHEDULE}" type="button">{/if}',
-          ),
+            ),
         ),
         'hidden' => 
         array (
-          0 => '<input type="hidden" name="isSaveAndNew">',
-          1 => '<input type="hidden" name="status">',
-          2 => '<input type="hidden" name="isSaveFromDetailView">',
-          3 => '<input type="hidden" name="isSave">',
+            0 => '<input type="hidden" name="isSaveAndNew">',
+            1 => '<input type="hidden" name="status">',
+            2 => '<input type="hidden" name="isSaveFromDetailView">',
+            3 => '<input type="hidden" name="isSave">',
         ),
         'headerTpl' => 'modules/Calls/tpls/detailHeader.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,
-      'includes' => 
-      array (
+        ),
+        'useTabs' => true,
+        'includes' => 
+        array (
         'SA_RESCHEDULE' => 
         array (
-          'file' => 'modules/Calls_Reschedule/reschedule_form.js',
+            'file' => 'modules/Calls_Reschedule/reschedule_form.js',
+        ),
+            array('file' => 'modules/Reminders/Reminders.js'),
         ),
-          array('file' => 'modules/Reminders/Reminders.js'),
-      ),
-      'tabDefs' => 
-      array (
+        'tabDefs' => 
+        array (
         'LBL_CALL_INFORMATION' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
         ),
         'LBL_RESCHEDULE_PANEL' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' =>
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'lbl_call_information' => 
-      array (
+        'lbl_call_information' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'name',
             'label' => 'LBL_SUBJECT',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'direction',
             'customCode' => '{$fields.direction.options[$fields.direction.value]} {$fields.status.options[$fields.status.value]}',
             'label' => 'LBL_STATUS',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'date_start',
             'customCode' => '{$fields.date_start.value} {$fields.time_start.value}&nbsp;',
             'label' => 'LBL_DATE_TIME',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'parent_name',
             'customLabel' => '{sugar_translate label=\'LBL_MODULE_NAME\' module=$fields.parent_type.value}',
-          ),
+            ),
         ),
         2 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'duration_hours',
             'customCode' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV}&nbsp;',
             'label' => 'LBL_DURATION',
-          ),
+            ),
 //          1 =>
 //          array (
 //            'name' => 'reminder_time',
@@ -197,55 +197,55 @@ 
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',
-          ),
+            ),
         ),
         4 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'assigned_user_name',
             'customCode' => '{$fields.assigned_user_name.value}',
             'label' => 'LBL_ASSIGNED_TO',
-          ),
+            ),
         ),
-      ),
-      'lbl_reschedule_panel' => 
-      array (
+        ),
+        'lbl_reschedule_panel' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'reschedule_history',
             'comment' => 'Call duration, minutes portion',
             'label' => 'LBL_RESCHEDULE_HISTORY',
-          ),
-          1 => '',
+            ),
+            1 => '',
+        ),
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' =>
-      array (
+        'LBL_PANEL_ASSIGNMENT' =>
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_ENTERED',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'date_modified',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_MODIFIED',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

Spacing +43 added lines, -43 removed lines

@@ -39,27 +39,27 @@ 
 
 
 $viewdefs ['Calls'] =
-array (
+array(
   'DetailView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'form' => 
-      array (
+      array(
         'buttons' => 
-        array (
+        array(
           0 => 'EDIT',
           1 => 'DUPLICATE',
           2 => 'DELETE',
           3 => 
-          array (
+          array(
             'customCode' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSaveAndNew" value="false">  <input type="hidden" name="status" value="">  <input type="hidden" name="isSaveFromDetailView" value="true">  <input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"   class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Calls\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'" id="close_create_button" name="button"  value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"  type="submit">{/if}',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'submit',
               'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
               'htmlOptions' => 
-              array (
+              array(
                 'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
                 'class' => 'button',
                 'onclick' => 'this.form.isSaveFromDetailView.value=true; this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Calls\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'',
@@ -70,14 +70,14 @@ 
             ),
           ),
           4 => 
-          array (
+          array(
             'customCode' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSave" value="false">  <input title="{$APP.LBL_CLOSE_BUTTON_TITLE}"  accesskey="{$APP.LBL_CLOSE_BUTTON_KEY}"  class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Calls\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'" id="close_button" name="button1"  value="{$APP.LBL_CLOSE_BUTTON_TITLE}"  type="submit">{/if}',
             'sugar_html' => 
-            array (
+            array(
               'type' => 'submit',
               'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
               'htmlOptions' => 
-              array (
+              array(
                 'title' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
                 'accesskey' => '{$APP.LBL_CLOSE_BUTTON_KEY}',
                 'class' => 'button',
@@ -89,12 +89,12 @@ 
             ),
           ),
           'SA_RESCHEDULE' => 
-          array (
+          array(
             'customCode' => '{if $fields.status.value != "Held"} <input title="{$MOD.LBL_RESCHEDULE}" class="button" onclick="get_form();" name="Reschedule" id="reschedule_button" value="{$MOD.LBL_RESCHEDULE}" type="button">{/if}',
           ),
         ),
         'hidden' => 
-        array (
+        array(
           0 => '<input type="hidden" name="isSaveAndNew">',
           1 => '<input type="hidden" name="status">',
           2 => '<input type="hidden" name="isSaveFromDetailView">',
@@ -104,82 +104,82 @@ 
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'useTabs' => true,
       'includes' => 
-      array (
+      array(
         'SA_RESCHEDULE' => 
-        array (
+        array(
           'file' => 'modules/Calls_Reschedule/reschedule_form.js',
         ),
           array('file' => 'modules/Reminders/Reminders.js'),
       ),
       'tabDefs' => 
-      array (
+      array(
         'LBL_CALL_INFORMATION' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_RESCHEDULE_PANEL' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' =>
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
     'panels' => 
-    array (
+    array(
       'lbl_call_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'name',
             'label' => 'LBL_SUBJECT',
           ),
           1 => 
-          array (
+          array(
             'name' => 'direction',
             'customCode' => '{$fields.direction.options[$fields.direction.value]} {$fields.status.options[$fields.status.value]}',
             'label' => 'LBL_STATUS',
           ),
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'date_start',
             'customCode' => '{$fields.date_start.value} {$fields.time_start.value}&nbsp;',
             'label' => 'LBL_DATE_TIME',
           ),
           1 => 
-          array (
+          array(
             'name' => 'parent_name',
             'customLabel' => '{sugar_translate label=\'LBL_MODULE_NAME\' module=$fields.parent_type.value}',
           ),
         ),
         2 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'duration_hours',
             'customCode' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV}&nbsp;',
             'label' => 'LBL_DURATION',
@@ -196,18 +196,18 @@ 
                 ),
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',
           ),
         ),
         4 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'assigned_user_name',
             'customCode' => '{$fields.assigned_user_name.value}',
             'label' => 'LBL_ASSIGNED_TO',
@@ -215,11 +215,11 @@ 
         ),
       ),
       'lbl_reschedule_panel' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'reschedule_history',
             'comment' => 'Call duration, minutes portion',
             'label' => 'LBL_RESCHEDULE_HISTORY',
@@ -228,17 +228,17 @@ 
         ),
       ),
       'LBL_PANEL_ASSIGNMENT' =>
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_ENTERED',
           ),
           1 => 
-          array (
+          array(
             'name' => 'date_modified',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}&nbsp;',
             'label' => 'LBL_DATE_MODIFIED',

modules/Calls/metadata/quickcreatedefs.php

Indentation +57 added lines, -57 removed lines

@@ -39,117 +39,117 @@ 
 
 $viewdefs ['Calls'] =
 array (
-  'QuickCreate' =>
-  array (
+    'QuickCreate' =>
+    array (
     'templateMeta' =>
     array (
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
-      'maxColumns' => '2',
-      'form' =>
-      array (
+        'maxColumns' => '2',
+        'form' =>
+        array (
         'hidden' =>
         array (
-          0 => '<input type="hidden" name="isSaveAndNew" value="false">',
-          1 => '<input type="hidden" name="send_invites">',
-          2 => '<input type="hidden" name="user_invitees">',
-          3 => '<input type="hidden" name="lead_invitees">',
-          4 => '<input type="hidden" name="contact_invitees">',
+            0 => '<input type="hidden" name="isSaveAndNew" value="false">',
+            1 => '<input type="hidden" name="send_invites">',
+            2 => '<input type="hidden" name="user_invitees">',
+            3 => '<input type="hidden" name="lead_invitees">',
+            4 => '<input type="hidden" name="contact_invitees">',
         ),
         'buttons' =>
         array (
-          0 =>
-          array (
+            0 =>
+            array (
             'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button" onclick="SUGAR.calls.fill_invitees();this.form.action.value=\'Save\'; this.form.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}this.form.return_id.value=\'\'; {/if}return check_form(\'EditView\') && isValidDuration();" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
-          ),
-          1 => 'CANCEL',
-          2 =>
-          array (
+            ),
+            1 => 'CANCEL',
+            2 =>
+            array (
             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" class="button" onclick="this.form.send_invites.value=\'1\';SUGAR.calls.fill_invitees();this.form.action.value=\'Save\';this.form.return_action.value=\'EditView\';this.form.return_module.value=\'{$smarty.request.return_module}\';return check_form(\'EditView\') && isValidDuration();" type="submit" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
-          ),
-          3 =>
-          array (
+            ),
+            3 =>
+            array (
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" class="button" onclick="SUGAR.calls.fill_invitees(); this.form.status.value=\'Held\'; this.form.action.value=\'Save\'; this.form.return_module.value=\'Calls\'; this.form.isDuplicate.value=true; this.form.isSaveAndNew.value=true; this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'; return check_form(\'EditView\') && isValidDuration();" type="submit" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
-          ),
+            ),
+        ),
         ),
-      ),
-      'widths' =>
-      array (
+        'widths' =>
+        array (
         0 =>
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 =>
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>'.
+        'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>'.
                 '{sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}' .
                 '<script>toggle_portal_flag();function toggle_portal_flag()  {literal} { {/literal} {$TOGGLE_JS} {literal} } {/literal} </script>',
 
-      'useTabs' => false,
+        'useTabs' => false,
     ),
     'panels' =>
     array (
-      'default' =>
-      array (
+        'default' =>
         array (
-          array (
+        array (
+            array (
             'name' => 'name',
             'displayParams' =>
             array (
-              'required' => true,
+                'required' => true,
+            ),
             ),
-          ),
-          array (
+            array (
             'name' => 'status',
             'displayParams' =>
             array (
-              'required' => true,
+                'required' => true,
             ),
             'fields' =>
             array (
-              array (
+                array (
                 'name' => 'direction',
-              ),
-              array (
+                ),
+                array (
                 'name' => 'status',
-              ),
+                ),
+            ),
             ),
-          ),
         ),
 
         array (
-          array (
+            array (
             'name' => 'date_start',
             'type' => 'datetimecombo',
             'displayParams' =>
             array (
-              'required' => true,
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
+                'required' => true,
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
             'label' => 'LBL_DATE_TIME',
-          ),
-          array (
+            ),
+            array (
             'name' => 'parent_name',
             'label' => 'LBL_LIST_RELATED_TO',
-          ),
+            ),
         ),
 
         array (
-          array (
+            array (
             'name' => 'duration_hours',
             'label' => 'LBL_DURATION',
             'customCode' => '{literal}<script type="text/javascript">function isValidDuration() { form = document.getElementById(\'EditView\'); if ( form.duration_hours.value + form.duration_minutes.value <= 0 ) { alert(\'{/literal}{$MOD.NOTICE_DURATION_TIME}{literal}\'); return false; } return true; }</script>{/literal}<input id="duration_hours" name="duration_hours" tabindex="1" size="2" maxlength="2" type="text" value="{$fields.duration_hours.value}" onkeyup="SugarWidgetScheduler.update_time();"/>{$fields.duration_minutes.value}&nbsp;<span class="dateFormat">{$MOD.LBL_HOURS_MINUTES}',
             'displayParams' =>
             array (
-              'required' => true,
+                'required' => true,
+            ),
             ),
-          ),
 //          array(
 //            'name' => 'reminder_time',
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
@@ -164,21 +164,21 @@ 
         ),
 
         array (
-          array (
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
-          ),
+            ),
         ),
 
         array (
-          array (
+            array (
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  ),
+    ),
 );
 ?>

Spacing +35 added lines, -35 removed lines

@@ -38,19 +38,19 @@ 
  ********************************************************************************/
 
 $viewdefs ['Calls'] =
-array (
+array(
   'QuickCreate' =>
-  array (
+  array(
     'templateMeta' =>
-    array (
+    array(
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
       'maxColumns' => '2',
       'form' =>
-      array (
+      array(
         'hidden' =>
-        array (
+        array(
           0 => '<input type="hidden" name="isSaveAndNew" value="false">',
           1 => '<input type="hidden" name="send_invites">',
           2 => '<input type="hidden" name="user_invitees">',
@@ -58,95 +58,95 @@ 
           4 => '<input type="hidden" name="contact_invitees">',
         ),
         'buttons' =>
-        array (
+        array(
           0 =>
-          array (
+          array(
             'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button" onclick="SUGAR.calls.fill_invitees();this.form.action.value=\'Save\'; this.form.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}this.form.return_id.value=\'\'; {/if}return check_form(\'EditView\') && isValidDuration();" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
           ),
           1 => 'CANCEL',
           2 =>
-          array (
+          array(
             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" class="button" onclick="this.form.send_invites.value=\'1\';SUGAR.calls.fill_invitees();this.form.action.value=\'Save\';this.form.return_action.value=\'EditView\';this.form.return_module.value=\'{$smarty.request.return_module}\';return check_form(\'EditView\') && isValidDuration();" type="submit" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
           ),
           3 =>
-          array (
+          array(
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" class="button" onclick="SUGAR.calls.fill_invitees(); this.form.status.value=\'Held\'; this.form.action.value=\'Save\'; this.form.return_module.value=\'Calls\'; this.form.isDuplicate.value=true; this.form.isSaveAndNew.value=true; this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'; return check_form(\'EditView\') && isValidDuration();" type="submit" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
           ),
         ),
       ),
       'widths' =>
-      array (
+      array(
         0 =>
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 =>
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>'.
-                '{sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}' .
+                '{sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}'.
                 '<script>toggle_portal_flag();function toggle_portal_flag()  {literal} { {/literal} {$TOGGLE_JS} {literal} } {/literal} </script>',
 
       'useTabs' => false,
     ),
     'panels' =>
-    array (
+    array(
       'default' =>
-      array (
-        array (
-          array (
+      array(
+        array(
+          array(
             'name' => 'name',
             'displayParams' =>
-            array (
+            array(
               'required' => true,
             ),
           ),
-          array (
+          array(
             'name' => 'status',
             'displayParams' =>
-            array (
+            array(
               'required' => true,
             ),
             'fields' =>
-            array (
-              array (
+            array(
+              array(
                 'name' => 'direction',
               ),
-              array (
+              array(
                 'name' => 'status',
               ),
             ),
           ),
         ),
 
-        array (
-          array (
+        array(
+          array(
             'name' => 'date_start',
             'type' => 'datetimecombo',
             'displayParams' =>
-            array (
+            array(
               'required' => true,
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
             'label' => 'LBL_DATE_TIME',
           ),
-          array (
+          array(
             'name' => 'parent_name',
             'label' => 'LBL_LIST_RELATED_TO',
           ),
         ),
 
-        array (
-          array (
+        array(
+          array(
             'name' => 'duration_hours',
             'label' => 'LBL_DURATION',
             'customCode' => '{literal}<script type="text/javascript">function isValidDuration() { form = document.getElementById(\'EditView\'); if ( form.duration_hours.value + form.duration_minutes.value <= 0 ) { alert(\'{/literal}{$MOD.NOTICE_DURATION_TIME}{literal}\'); return false; } return true; }</script>{/literal}<input id="duration_hours" name="duration_hours" tabindex="1" size="2" maxlength="2" type="text" value="{$fields.duration_hours.value}" onkeyup="SugarWidgetScheduler.update_time();"/>{$fields.duration_minutes.value}&nbsp;<span class="dateFormat">{$MOD.LBL_HOURS_MINUTES}',
             'displayParams' =>
-            array (
+            array(
               'required' => true,
             ),
           ),
@@ -155,7 +155,7 @@ 
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
 //            'label' => 'LBL_REMINDER',
 //          ),
-            array (
+            array(
                 'name' => 'reminders',
                 'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
                 'label' => 'LBL_REMINDERS',
@@ -163,15 +163,15 @@ 
 
         ),
 
-        array (
-          array (
+        array(
+          array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
           ),
         ),
 
-        array (
-          array (
+        array(
+          array(
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',

modules/Calls/metadata/listviewdefs.php

Indentation +30 added lines, -30 removed lines

@@ -39,8 +39,8 @@ 
 
 $listViewDefs ['Calls'] = 
 array (
-  'SET_COMPLETE' => 
-  array (
+    'SET_COMPLETE' => 
+    array (
     'width' => '1%',
     'label' => 'LBL_LIST_CLOSE',
     'link' => true,
@@ -48,25 +48,25 @@ 
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'status',
+        0 => 'status',
+    ),
     ),
-  ),
-  'DIRECTION' => 
-  array (
+    'DIRECTION' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_LIST_DIRECTION',
     'link' => false,
     'default' => true,
-  ),
-  'NAME' => 
-  array (
+    ),
+    'NAME' => 
+    array (
     'width' => '40%',
     'label' => 'LBL_LIST_SUBJECT',
     'link' => true,
     'default' => true,
-  ),
-  'CONTACT_NAME' => 
-  array (
+    ),
+    'CONTACT_NAME' => 
+    array (
     'width' => '20%',
     'label' => 'LBL_LIST_CONTACT',
     'link' => true,
@@ -74,9 +74,9 @@ 
     'module' => 'Contacts',
     'default' => true,
     'ACLTag' => 'CONTACT',
-  ),
-  'PARENT_NAME' => 
-  array (
+    ),
+    'PARENT_NAME' => 
+    array (
     'width' => '20%',
     'label' => 'LBL_LIST_RELATED_TO',
     'dynamic_module' => 'PARENT_TYPE',
@@ -87,40 +87,40 @@ 
     'ACLTag' => 'PARENT',
     'related_fields' => 
     array (
-      0 => 'parent_id',
-      1 => 'parent_type',
+        0 => 'parent_id',
+        1 => 'parent_type',
+    ),
     ),
-  ),
-  'DATE_START' => 
-  array (
+    'DATE_START' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_LIST_DATE',
     'link' => false,
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'time_start',
+        0 => 'time_start',
+    ),
     ),
-  ),
-  'ASSIGNED_USER_NAME' => 
-  array (
+    'ASSIGNED_USER_NAME' => 
+    array (
     'width' => '2%',
     'label' => 'LBL_LIST_ASSIGNED_TO_NAME',
     'module' => 'Employees',
     'id' => 'ASSIGNED_USER_ID',
     'default' => true,
-  ),
-  'STATUS' => 
-  array (
+    ),
+    'STATUS' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_STATUS',
     'link' => false,
     'default' => false,
-  ),
-  'DATE_ENTERED' => array (
+    ),
+    'DATE_ENTERED' => array (
     'width' => '10%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => true
-  ),  
+    ),  
 );
 ?>

Spacing +13 added lines, -13 removed lines

@@ -38,35 +38,35 @@ 
  ********************************************************************************/
 
 $listViewDefs ['Calls'] = 
-array (
+array(
   'SET_COMPLETE' => 
-  array (
+  array(
     'width' => '1%',
     'label' => 'LBL_LIST_CLOSE',
     'link' => true,
     'sortable' => false,
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'status',
     ),
   ),
   'DIRECTION' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_LIST_DIRECTION',
     'link' => false,
     'default' => true,
   ),
   'NAME' => 
-  array (
+  array(
     'width' => '40%',
     'label' => 'LBL_LIST_SUBJECT',
     'link' => true,
     'default' => true,
   ),
   'CONTACT_NAME' => 
-  array (
+  array(
     'width' => '20%',
     'label' => 'LBL_LIST_CONTACT',
     'link' => true,
@@ -76,7 +76,7 @@ 
     'ACLTag' => 'CONTACT',
   ),
   'PARENT_NAME' => 
-  array (
+  array(
     'width' => '20%',
     'label' => 'LBL_LIST_RELATED_TO',
     'dynamic_module' => 'PARENT_TYPE',
@@ -86,24 +86,24 @@ 
     'sortable' => false,
     'ACLTag' => 'PARENT',
     'related_fields' => 
-    array (
+    array(
       0 => 'parent_id',
       1 => 'parent_type',
     ),
   ),
   'DATE_START' => 
-  array (
+  array(
     'width' => '15%',
     'label' => 'LBL_LIST_DATE',
     'link' => false,
     'default' => true,
     'related_fields' => 
-    array (
+    array(
       0 => 'time_start',
     ),
   ),
   'ASSIGNED_USER_NAME' => 
-  array (
+  array(
     'width' => '2%',
     'label' => 'LBL_LIST_ASSIGNED_TO_NAME',
     'module' => 'Employees',
@@ -111,13 +111,13 @@ 
     'default' => true,
   ),
   'STATUS' => 
-  array (
+  array(
     'width' => '10%',
     'label' => 'LBL_STATUS',
     'link' => false,
     'default' => false,
   ),
-  'DATE_ENTERED' => array (
+  'DATE_ENTERED' => array(
     'width' => '10%',
     'label' => 'LBL_DATE_ENTERED',
     'default' => true

modules/Calls/views/view.edit.php

Indentation +34 added lines, -34 removed lines

@@ -44,46 +44,46 @@
 
 class CallsViewEdit extends ViewEdit
 {
- 	/**
- 	 * @see SugarView::preDisplay()
- 	 */
- 	public function preDisplay()
- 	{
- 		if($_REQUEST['module'] != 'Calls' && isset($_REQUEST['status']) && empty($_REQUEST['status'])) {
-	       $this->bean->status = '';
- 		} //if
+        /**
+         * @see SugarView::preDisplay()
+         */
+        public function preDisplay()
+        {
+            if($_REQUEST['module'] != 'Calls' && isset($_REQUEST['status']) && empty($_REQUEST['status'])) {
+            $this->bean->status = '';
+            } //if
         if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
-	       $this->bean->status = 'Held';
- 		}
- 		parent::preDisplay();
- 	}
+            $this->bean->status = 'Held';
+            }
+            parent::preDisplay();
+        }
 
- 	/**
- 	 * @see SugarView::display()
- 	 */
- 	public function display()
- 	{
- 		global $json;
+        /**
+         * @see SugarView::display()
+         */
+        public function display()
+        {
+            global $json;
         $json = getJSONobj();
         $json_config = new json_config();
-		if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
-			$javascript = $json_config->get_static_json_server(false, true, 'Calls', $this->bean->json_id);
+        if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
+            $javascript = $json_config->get_static_json_server(false, true, 'Calls', $this->bean->json_id);
 
-		} else {
-			$this->bean->json_id = $this->bean->id;
-			$javascript = $json_config->get_static_json_server(false, true, 'Calls', $this->bean->id);
+        } else {
+            $this->bean->json_id = $this->bean->id;
+            $javascript = $json_config->get_static_json_server(false, true, 'Calls', $this->bean->id);
 
-		}
- 		$this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
+        }
+            $this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
 
-		$this->ss->assign('remindersData', Reminder::loadRemindersData('Calls', $this->bean->id, $this->ev->isDuplicate));
-		$this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Calls', $this->bean->id, $this->ev->isDuplicate));
-		$this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
-		$this->ss->assign('remindersDisabled', json_encode(false));
+        $this->ss->assign('remindersData', Reminder::loadRemindersData('Calls', $this->bean->id, $this->ev->isDuplicate));
+        $this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Calls', $this->bean->id, $this->ev->isDuplicate));
+        $this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
+        $this->ss->assign('remindersDisabled', json_encode(false));
 
- 		if($this->ev->isDuplicate){
-	        $this->bean->status = $this->bean->getDefaultStatus();
- 		} //if
- 		parent::display();
- 	}
+            if($this->ev->isDuplicate){
+            $this->bean->status = $this->bean->getDefaultStatus();
+            } //if
+            parent::display();
+        }
 }

Spacing +4 added lines, -4 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
@@ -49,10 +49,10 @@ 
  	 */
  	public function preDisplay()
  	{
- 		if($_REQUEST['module'] != 'Calls' && isset($_REQUEST['status']) && empty($_REQUEST['status'])) {
+ 		if ($_REQUEST['module'] != 'Calls' && isset($_REQUEST['status']) && empty($_REQUEST['status'])) {
 	       $this->bean->status = '';
  		} //if
-        if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
+        if (!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
 	       $this->bean->status = 'Held';
  		}
  		parent::preDisplay();
@@ -81,7 +81,7 @@ 
 		$this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
 		$this->ss->assign('remindersDisabled', json_encode(false));
 
- 		if($this->ev->isDuplicate){
+ 		if ($this->ev->isDuplicate) {
 	        $this->bean->status = $this->bean->getDefaultStatus();
  		} //if
  		parent::display();

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

modules/Accounts/AccountsQuickCreate.php

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.
@@ -53,7 +53,7 @@ 
         
         parent::process();
   
-        if($this->viaAJAX) { // override for ajax call
+        if ($this->viaAJAX) { // override for ajax call
             $this->ss->assign('saveOnclick', "onclick='if(check_form(\"accountsQuickCreate\")) return SUGAR.subpanelUtils.inlineSave(this.form.id, \"accounts\"); else return false;'");
             $this->ss->assign('cancelOnclick', "onclick='return SUGAR.subpanelUtils.cancelCreate(\"subpanel_accounts\")';");
         }

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/Activities/SetAcceptStatus.php

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.
@@ -42,7 +42,7 @@ 
 
 
 
-    global $json,$current_user;
+    global $json, $current_user;
     
     
     if ($_REQUEST['object_type'] == "Meeting")

Braces +4 added lines, -3 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.
@@ -50,8 +52,7 @@ 
         $focus = new Meeting();
         $focus->id = $_REQUEST['object_id'];
         $test = $focus->set_accept_status($current_user, $_REQUEST['accept_status']);
-    }
-    else if ($_REQUEST['object_type'] == "Call")
+    } else if ($_REQUEST['object_type'] == "Call")
     {
         $focus = new Call();
         $focus->id = $_REQUEST['object_id'];

modules/Activities/EmailReminder.php

Indentation +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
             $recipients = $this->getRecipients($id,'Meetings');
             $bean = new Meeting();
             $bean->retrieve($id);			
-			if ( $this->sendReminders($bean, $admin, $recipients) ) {
+            if ( $this->sendReminders($bean, $admin, $recipients) ) {
                 $bean->email_reminder_sent = 1;
                 $bean->save();
             }            
@@ -198,7 +198,7 @@ 
      * @param SugarBean $bean
      * @param User $user
      * @return XTemplate 
-    */
+     */
     protected function setReminderBody(XTemplate $xtpl, SugarBean $bean, User $user)
     {
     

Spacing +28 added lines, -28 removed lines

@@ -71,13 +71,13 @@ 
     public function __construct()
     {
         $max_time = 0;
-        if(isset($GLOBALS['app_list_strings']['reminder_time_options'])){
-            foreach($GLOBALS['app_list_strings']['reminder_time_options'] as $seconds => $value ) {
-                if ( $seconds > $max_time ) {
+        if (isset($GLOBALS['app_list_strings']['reminder_time_options'])) {
+            foreach ($GLOBALS['app_list_strings']['reminder_time_options'] as $seconds => $value) {
+                if ($seconds > $max_time) {
                     $max_time = $seconds;
                 }
             }
-        }else{
+        } else {
             $max_time = 8400;
         }
         $this->now = $GLOBALS['timedate']->nowDb();
@@ -97,22 +97,22 @@ 
         Reminder::sendEmailReminders($this, $admin);
         
         $meetings = $this->getMeetingsForRemind();
-        foreach($meetings as $id ) {
-            $recipients = $this->getRecipients($id,'Meetings');
+        foreach ($meetings as $id) {
+            $recipients = $this->getRecipients($id, 'Meetings');
             $bean = new Meeting();
             $bean->retrieve($id);			
-			if ( $this->sendReminders($bean, $admin, $recipients) ) {
+			if ($this->sendReminders($bean, $admin, $recipients)) {
                 $bean->email_reminder_sent = 1;
                 $bean->save();
             }            
         }
         
         $calls = $this->getCallsForRemind();
-        foreach($calls as $id ) {
-            $recipients = $this->getRecipients($id,'Calls');
+        foreach ($calls as $id) {
+            $recipients = $this->getRecipients($id, 'Calls');
             $bean = new Call();
             $bean->retrieve($id);
-            if ( $this->sendReminders($bean, $admin, $recipients) ) {
+            if ($this->sendReminders($bean, $admin, $recipients)) {
                 $bean->email_reminder_sent = 1;
                 $bean->save();
             }
@@ -170,9 +170,9 @@ 
         $xtpl = new XTemplate(get_notify_template_file($current_language));
         $xtpl = $this->setReminderBody($xtpl, $bean, $user);
 
-        $template_name = $GLOBALS['beanList'][$bean->module_dir] . 'Reminder';
+        $template_name = $GLOBALS['beanList'][$bean->module_dir].'Reminder';
         $xtpl->parse($template_name);
-        $xtpl->parse($template_name . "_Subject");
+        $xtpl->parse($template_name."_Subject");
 
         $tempBody = from_html(trim($xtpl->text($template_name)));
         $mail->msgHTML($tempBody);
@@ -180,7 +180,7 @@ 
         $tempBody = preg_replace('/<a href=([\"\']?)(.*?)\1>(.*?)<\/a>/', "\\3 [\\2]", $tempBody);
 
         $mail->AltBody = strip_tags($tempBody);
-        $mail->Subject = strip_tags(from_html($xtpl->text($template_name . "_Subject")));
+        $mail->Subject = strip_tags(from_html($xtpl->text($template_name."_Subject")));
 
         $oe = new OutboundEmail();
         $oe = $oe->getSystemMailerSettings();
@@ -215,9 +215,9 @@ 
         $object = strtoupper($bean->object_name);
 
         $xtpl->assign("{$object}_SUBJECT", $bean->name);
-        $date = $GLOBALS['timedate']->fromUser($bean->date_start,$GLOBALS['current_user']);
+        $date = $GLOBALS['timedate']->fromUser($bean->date_start, $GLOBALS['current_user']);
         $xtpl->assign("{$object}_STARTDATE", $GLOBALS['timedate']->asUser($date, $user)." ".TimeDate::userTimezoneSuffix($date, $user));
-        if ( isset($bean->location) ) {
+        if (isset($bean->location)) {
             $xtpl->assign("{$object}_LOCATION", $bean->location);
         }
         $xtpl->assign("{$object}_CREATED_BY", $user->full_name);
@@ -244,10 +244,10 @@ 
         ";
         $re = $db->query($query);
         $meetings = array();
-        while($row = $db->fetchByAssoc($re) ) {
-            $remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($row['date_start'],'datetime'))->modify("-{$row['email_reminder_time']} seconds")->ts;
+        while ($row = $db->fetchByAssoc($re)) {
+            $remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($row['date_start'], 'datetime'))->modify("-{$row['email_reminder_time']} seconds")->ts;
             $now_ts = $GLOBALS['timedate']->getNow()->ts;
-            if ( $now_ts >= $remind_ts ) {
+            if ($now_ts >= $remind_ts) {
                 $meetings[] = $row['id'];
             }
         }
@@ -272,10 +272,10 @@ 
         ";
         $re = $db->query($query);
         $calls = array();
-        while($row = $db->fetchByAssoc($re) ) {
-            $remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($row['date_start'],'datetime'))->modify("-{$row['email_reminder_time']} seconds")->ts;
+        while ($row = $db->fetchByAssoc($re)) {
+            $remind_ts = $GLOBALS['timedate']->fromDb($db->fromConvert($row['date_start'], 'datetime'))->modify("-{$row['email_reminder_time']} seconds")->ts;
             $now_ts = $GLOBALS['timedate']->getNow()->ts;
-            if ( $now_ts >= $remind_ts ) {
+            if ($now_ts >= $remind_ts) {
                 $calls[] = $row['id'];
             }
         }
@@ -292,7 +292,7 @@ 
     {
         global $db;
     
-        switch($module ) {
+        switch ($module) {
             case "Meetings":
                 $field_part = "meeting";
                 break;
@@ -308,10 +308,10 @@ 
         $query = "SELECT user_id FROM {$field_part}s_users WHERE {$field_part}_id = '{$id}' AND accept_status != 'decline' AND deleted = 0
         ";
         $re = $db->query($query);
-        while($row = $db->fetchByAssoc($re) ) {
+        while ($row = $db->fetchByAssoc($re)) {
             $user = new User();
             $user->retrieve($row['user_id']);
-            if ( !empty($user->email1) ) {
+            if (!empty($user->email1)) {
                 $arr = array(
                     'type' => 'Users',
                     'name' => $user->full_name,
@@ -323,10 +323,10 @@ 
         // fetch contacts
         $query = "SELECT contact_id FROM {$field_part}s_contacts WHERE {$field_part}_id = '{$id}' AND accept_status != 'decline' AND deleted = 0";
         $re = $db->query($query);
-        while($row = $db->fetchByAssoc($re) ) {
+        while ($row = $db->fetchByAssoc($re)) {
             $contact = new Contact();
             $contact->retrieve($row['contact_id']);
-            if ( !empty($contact->email1) ) {
+            if (!empty($contact->email1)) {
                 $arr = array(
                     'type' => 'Contacts',
                     'name' => $contact->full_name,
@@ -338,10 +338,10 @@ 
         // fetch leads
         $query = "SELECT lead_id FROM {$field_part}s_leads WHERE {$field_part}_id = '{$id}' AND accept_status != 'decline' AND deleted = 0";
         $re = $db->query($query);
-        while($row = $db->fetchByAssoc($re) ) {
+        while ($row = $db->fetchByAssoc($re)) {
             $lead = new Lead();
             $lead->retrieve($row['lead_id']);
-            if ( !empty($lead->email1) ) {
+            if (!empty($lead->email1)) {
                 $arr = array(
                     'type' => 'Leads',
                     'name' => $lead->full_name,

Braces +5 added lines, -9 removed lines

@@ -77,7 +77,7 @@ 
                     $max_time = $seconds;
                 }
             }
-        }else{
+        } else{
             $max_time = 8400;
         }
         $this->now = $GLOBALS['timedate']->nowDb();
@@ -132,19 +132,16 @@ 
     {
         if (empty($_SESSION['authenticated_user_language'])) {
             $current_language = $GLOBALS['sugar_config']['default_language'];
-        }
-        else {
+        } else {
             $current_language = $_SESSION['authenticated_user_language'];
         }
 
         if (!empty($bean->created_by)) {
             $user_id = $bean->created_by;
-        }
-        else {
+        } else {
             if (!empty($bean->assigned_user_id)) {
                 $user_id = $bean->assigned_user_id;
-            }
-            else {
+            } else {
                 $user_id = $GLOBALS['current_user']->id;
             }
         }
@@ -158,8 +155,7 @@ 
         if (empty($admin->settings['notify_send_from_assigning_user'])) {
             $from_address = $admin->settings['notify_fromaddress'];
             $from_name = $admin->settings['notify_fromname'] ? "" : $admin->settings['notify_fromname'];
-        }
-        else {
+        } else {
             $from_address = $user->emailAddress->getReplyToAddress($user);
             $from_name = $user->full_name;
         }

modules/Leads/metadata/additionalDetails.php

Indentation +36 added lines, -36 removed lines

@@ -40,13 +40,13 @@ 
 
  
 function additionalDetailsLead($fields) {
-	static $mod_strings;
-	if(empty($mod_strings)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'Leads');
-	}
+    static $mod_strings;
+    if(empty($mod_strings)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'Leads');
+    }
 		
-	$overlib_string = '';
+    $overlib_string = '';
     if(!empty($fields['ID'])) {
         $overlib_string .= '<input type="hidden" value="'. $fields['ID'];
         $overlib_string .= '">';
@@ -55,39 +55,39 @@ 
     $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Leads.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
 
     if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
-		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
-		$overlib_string .= '<br>';  
-		if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
-	if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+        !empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
+        !empty($fields['PRIMARY_ADDRESS_COUNTRY']))
+            $overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
+    if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
+    if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
+    if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
+    if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
+    if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
+    if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
+        $overlib_string .= '<br>';  
+        if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
+    if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
+    if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+    if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
 
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
-								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
-								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
-								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
-								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
-								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
+    if(!empty($fields['EMAIL2'])) 
+        $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
+                                    "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
+                                    "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
+                                    "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
+                                    "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
+                                    "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
 	
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
-	}	
+    if(!empty($fields['DESCRIPTION'])) { 
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+    }	
 	
-	return array('fieldToAddTo' => 'NAME', 
-				 'string' => $overlib_string, 
-				 'editLink' => "index.php?action=EditView&module=Leads&return_module=Leads&record={$fields['ID']}", 
-				 'viewLink' => "index.php?action=DetailView&module=Leads&return_module=Leads&record={$fields['ID']}");
+    return array('fieldToAddTo' => 'NAME', 
+                    'string' => $overlib_string, 
+                    'editLink' => "index.php?action=EditView&module=Leads&return_module=Leads&record={$fields['ID']}", 
+                    'viewLink' => "index.php?action=DetailView&module=Leads&return_module=Leads&record={$fields['ID']}");
 }
  
- ?>
+    ?>
  

Spacing +26 added lines, -26 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.
@@ -41,46 +41,46 @@ 
  
 function additionalDetailsLead($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Leads');
 	}
 		
 	$overlib_string = '';
-    if(!empty($fields['ID'])) {
-        $overlib_string .= '<input type="hidden" value="'. $fields['ID'];
+    if (!empty($fields['ID'])) {
+        $overlib_string .= '<input type="hidden" value="'.$fields['ID'];
         $overlib_string .= '">';
     }
 
-    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Leads.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
+    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName='.SugarThemeRegistry::current()->name.'&imageName=Leads.gif"/> '.$mod_strings['LBL_CONTACT'].'</h2>';
 
-    if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
+    if (!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
 		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
+			$overlib_string .= '<b>'.$mod_strings['LBL_PRIMARY_ADDRESS'].'</b><br>';
+	if (!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'].'<br>';
+	if (!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'].', ';
+	if (!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'].' ';
+	if (!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'].'<br>';
+	if (strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
 		$overlib_string .= '<br>';  
-		if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
-	if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+		if (!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'.$mod_strings['LBL_MOBILE_PHONE'].'</b> <span class="phone">'.$fields['PHONE_MOBILE'].'</span><br>';
+	if (!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'.$mod_strings['LBL_HOME_PHONE'].'</b> <span class="phone">'.$fields['PHONE_HOME'].'</span><br>';
+	if (!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'.$mod_strings['LBL_OTHER_PHONE'].'</b> <span class="phone">'.$fields['PHONE_OTHER'].'</span><br>';
+	if (!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'.$mod_strings['LBL_LEAD_SOURCE'].'</b> '.$fields['LEAD_SOURCE'].'<br>';
 
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
-								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
-								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
-								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
-								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
+	if (!empty($fields['EMAIL2'])) 
+		$overlib_string .= '<b>'.$mod_strings['LBL_OTHER_EMAIL_ADDRESS'].'</b> '. 
+								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&".
+								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names".
+								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&".
+								 "to_email_addrs=".urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>").
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
 	
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['DESCRIPTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 	}	
 	
 	return array('fieldToAddTo' => 'NAME', 

Braces +42 added lines, -17 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.
@@ -56,31 +58,54 @@ 
 
     if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
 		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
-		$overlib_string .= '<br>';  
-		if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
-	if(!empty($fields['LEAD_SOURCE'])) $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+		!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+    			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
+    }
+	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
+	}
+	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) {
+	    $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
+	}
+	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) {
+			$overlib_string .= '<br>';
+	}
+		if(!empty($fields['PHONE_MOBILE'])) {
+		    $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
+		}
+	if(!empty($fields['PHONE_HOME'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
+	}
+	if(!empty($fields['PHONE_OTHER'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+	}
+	if(!empty($fields['LEAD_SOURCE'])) {
+	    $overlib_string .= '<b>'. $mod_strings['LBL_LEAD_SOURCE'] . '</b> ' . $fields['LEAD_SOURCE'] . '<br>';
+	}
 
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
+	if(!empty($fields['EMAIL2'])) {
+			$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
 								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
 								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
 								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
 								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
 								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
+	}
 	
 	if(!empty($fields['DESCRIPTION'])) { 
 		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+		if(strlen($fields['DESCRIPTION']) > 300) {
+		    $overlib_string .= '...';
+		}
 	}	
 	
 	return array('fieldToAddTo' => 'NAME', 

modules/Leads/metadata/convertdefs.php

Indentation +13 added lines, -13 removed lines

@@ -46,13 +46,13 @@ 
         'form'=>array(
             'hidden'=>array(
                 '<input type="hidden" name="opportunity_id" value="{$smarty.request.opportunity_id}">',
-    			'<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
-    			'<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
-    			'<input type="hidden" name="email_id" value="{$smarty.request.email_id}">',
-    			'<input type="hidden" name="inbound_email_id" value="{$smarty.request.inbound_email_id}">'
+                '<input type="hidden" name="case_id" value="{$smarty.request.case_id}">',
+                '<input type="hidden" name="bug_id" value="{$smarty.request.bug_id}">',
+                '<input type="hidden" name="email_id" value="{$smarty.request.email_id}">',
+                '<input type="hidden" name="inbound_email_id" value="{$smarty.request.inbound_email_id}">'
             )
         ),
-		'maxColumns' => '2', 
+        'maxColumns' => '2', 
         'widths' => array(
             array('label' => '10', 'field' => '30'), 
             array('label' => '10', 'field' => '30'),
@@ -105,7 +105,7 @@ 
     'copyData' => true,
     'required' => true,
     'select' => "account_name",
-	'default_action' => 'create',
+    'default_action' => 'create',
     'relationship' => 'accounts_contacts',
     'templateMeta' => array(
         'form'=>array(
@@ -229,7 +229,7 @@ 
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
             array (
-               'date_start', 
+                'date_start', 
                 array (
                     'name' => 'duration_hours',
                     'label' => 'LBL_DURATION',
@@ -250,7 +250,7 @@ 
 <span class="dateFormat">{sugar_translate label="LBL_HOURS_MINUTES" module="Calls"}',
                     'displayParams' => 
                     array (
-                      'required' => true,
+                        'required' => true,
                     ),
                 ),
             ),
@@ -288,8 +288,8 @@ 
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
             array (
-               'date_start', 
-	            array (
+                'date_start', 
+                array (
                     'name' => 'duration_hours',
                     'label' => 'LBL_DURATION',
                     'customCode' => '{literal}
@@ -309,7 +309,7 @@ 
 <span class="dateFormat">{sugar_translate label="LBL_HOURS_MINUTES" module="Calls"}',
                     'displayParams' => 
                     array (
-                      'required' => true,
+                        'required' => true,
                     ),
                 ),
             ),
@@ -344,8 +344,8 @@ 
             array (
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-			array (
-               'status', 'priority'
+            array (
+                'status', 'priority'
             ), 
             
             array (

Spacing +48 added lines, -48 removed lines

@@ -58,40 +58,40 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_CONTACT' => array (
-            array (
-                array (
+    'panels' =>array(
+        'LNK_NEW_CONTACT' => array(
+            array(
+                array(
                     'name' => 'first_name',
                     'customCode' => '{html_options name="Contactssalutation" options=$fields.salutation.options selected=$fields.salutation.value}&nbsp;<input name="Contactsfirst_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
                 ),
                 'title',
             ), 
-            array (
+            array(
                 'last_name',
                 'department',
             ),
-            array (
+            array(
                 array('name' => 'primary_address_street', 'label' => 'LBL_PRIMARY_ADDRESS'),
                 'phone_work',
             ),
-            array (
+            array(
                 array('name'=>'primary_address_city', 'label' => 'LBL_CITY'),
                 'phone_mobile',
             ),
-            array (
+            array(
                 array('name'=>'primary_address_state', 'label' => 'LBL_STATE'),
                 'phone_other',
             ),
-            array (
+            array(
                 array('name'=>'primary_address_postalcode', 'label' => 'LBL_POSTAL_CODE'),
                 'phone_fax',
             ),
-            array (
+            array(
                 array('name'=>'primary_address_country', 'label' => 'LBL_COUNTRY'),
                 'lead_source',
             ),
-            array (
+            array(
                 'email1',
 
             ),
@@ -123,13 +123,13 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_ACCOUNT' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_ACCOUNT' => array(
+            array(
                 'name',
                 'phone_office',
             ),
-            array (
+            array(
                 'website',
             ),
             array(
@@ -152,21 +152,21 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_OPPORTUNITY' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_OPPORTUNITY' => array(
+            array(
                 'name',
                 'currency_id'
             ), 
-            array (
+            array(
                 'sales_stage',
                 'amount'
             ),
-            array (
+            array(
                 'date_closed',
                 ''
             ),
-            array (
+            array(
                 'description'
             ),
         )
@@ -191,13 +191,13 @@ 
             array('label' => '10', 'field' => '30'),    
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_NOTE' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_NOTE' => array(
+            array(
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-            array (
-                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90) ),
+            array(
+                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90)),
             ),
         )
     ),
@@ -223,14 +223,14 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_CALL' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_CALL' => array(
+            array(
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-            array (
+            array(
                'date_start', 
-                array (
+                array(
                     'name' => 'duration_hours',
                     'label' => 'LBL_DURATION',
                     'customCode' => '{literal}
@@ -249,13 +249,13 @@ 
 {html_options name="Callsduration_minutes" options=$minutes_values selected=$fields.duration_minutes.value} &nbsp;
 <span class="dateFormat">{sugar_translate label="LBL_HOURS_MINUTES" module="Calls"}',
                     'displayParams' => 
-                    array (
+                    array(
                       'required' => true,
                     ),
                 ),
             ),
-            array (
-                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90) ),
+            array(
+                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90)),
             ),
         )
     ),
@@ -282,14 +282,14 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_MEETING' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_MEETING' => array(
+            array(
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-            array (
+            array(
                'date_start', 
-	            array (
+	            array(
                     'name' => 'duration_hours',
                     'label' => 'LBL_DURATION',
                     'customCode' => '{literal}
@@ -308,13 +308,13 @@ 
 {html_options name="Meetingsduration_minutes" options=$minutes_values selected=$fields.duration_minutes.value} &nbsp;
 <span class="dateFormat">{sugar_translate label="LBL_HOURS_MINUTES" module="Calls"}',
                     'displayParams' => 
-                    array (
+                    array(
                       'required' => true,
                     ),
                 ),
             ),
-            array (
-                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90) ),
+            array(
+                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90)),
             ),
         )
     ),
@@ -339,17 +339,17 @@ 
             array('label' => '10', 'field' => '30'),
         ),
     ),
-    'panels' =>array (
-        'LNK_NEW_TASK' => array (
-            array (
+    'panels' =>array(
+        'LNK_NEW_TASK' => array(
+            array(
                 array('name'=>'name', 'displayParams'=>array('size'=>90)),
             ), 
-			array (
+			array(
                'status', 'priority'
             ), 
             
-            array (
-                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90) ),
+            array(
+                array('name' => 'description', 'displayParams' => array('rows'=>10, 'cols'=>90)),
             ),
         )
     ),