Completed
Push — console-installer ( 3d54e5...e2b50d )
by Adam
69:10 queued 48:24
created
modules/Meetings/JoinExternalMeeting.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
     }
71 71
 }else{
72 72
     if(isset($row['id']) || $meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
73
-      SugarApplication::redirect($meetingBean->join_url);
73
+        SugarApplication::redirect($meetingBean->join_url);
74 74
     }else{
75 75
         //if the user is not invited or the owner of the meeting or an admin then they cannot join the meeting.
76 76
         $tplFile = 'modules/Meetings/tpls/extMeetingNotInvited.tpl';
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,40 +47,40 @@  discard block
 block discarded – undo
47 47
 
48 48
 global $db, $current_user, $mod_strings, $app_strings, $app_list_strings;
49 49
 
50
-$ret = $db->query("SELECT id FROM meetings_users WHERE meeting_id = '".$db->quote($_REQUEST['meeting_id'])."' AND user_id = '".$current_user->id."' AND deleted = 0",true);
50
+$ret = $db->query("SELECT id FROM meetings_users WHERE meeting_id = '".$db->quote($_REQUEST['meeting_id'])."' AND user_id = '".$current_user->id."' AND deleted = 0", true);
51 51
 $row = $db->fetchByAssoc($ret);
52 52
 
53 53
 $meetingBean = loadBean('Meetings');
54 54
 $meetingBean->retrieve($_REQUEST['meeting_id']);
55 55
 
56
-if ( $_REQUEST['host_meeting'] == '1' ) {
57
-    if($meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
56
+if ($_REQUEST['host_meeting'] == '1') {
57
+    if ($meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'], 'Meetings')) {
58 58
         SugarApplication::redirect($meetingBean->host_url);
59
-    }else{
59
+    } else {
60 60
         //since they are now the owner of the meeting nor an Admin they cannot start the meeting.
61 61
         $tplFile = 'modules/Meetings/tpls/extMeetingNoStart.tpl';
62
-        if ( file_exists('custom/'.$tplFile) ) {
62
+        if (file_exists('custom/'.$tplFile)) {
63 63
             $tplFile = 'custom/'.$tplFile;
64 64
         }
65 65
 
66 66
         $ss = new Sugar_Smarty();
67
-        $ss->assign('current_user',$current_user);
68
-        $ss->assign('bean',$meetingBean->toArray());
67
+        $ss->assign('current_user', $current_user);
68
+        $ss->assign('bean', $meetingBean->toArray());
69 69
         $ss->display($tplFile);
70 70
     }
71
-}else{
72
-    if(isset($row['id']) || $meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
71
+} else {
72
+    if (isset($row['id']) || $meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'], 'Meetings')) {
73 73
       SugarApplication::redirect($meetingBean->join_url);
74
-    }else{
74
+    } else {
75 75
         //if the user is not invited or the owner of the meeting or an admin then they cannot join the meeting.
76 76
         $tplFile = 'modules/Meetings/tpls/extMeetingNotInvited.tpl';
77
-        if ( file_exists('custom/'.$tplFile) ) {
77
+        if (file_exists('custom/'.$tplFile)) {
78 78
             $tplFile = 'custom/'.$tplFile;
79 79
         }
80 80
 
81 81
         $ss = new Sugar_Smarty();
82
-        $ss->assign('current_user',$current_user);
83
-        $ss->assign('bean',$meetingBean->toArray());
82
+        $ss->assign('current_user', $current_user);
83
+        $ss->assign('bean', $meetingBean->toArray());
84 84
         $ss->display($tplFile);
85 85
     }
86 86
 }
87 87
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,7 +58,7 @@  discard block
 block discarded – undo
56 58
 if ( $_REQUEST['host_meeting'] == '1' ) {
57 59
     if($meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
58 60
         SugarApplication::redirect($meetingBean->host_url);
59
-    }else{
61
+    } else{
60 62
         //since they are now the owner of the meeting nor an Admin they cannot start the meeting.
61 63
         $tplFile = 'modules/Meetings/tpls/extMeetingNoStart.tpl';
62 64
         if ( file_exists('custom/'.$tplFile) ) {
@@ -68,10 +70,10 @@  discard block
 block discarded – undo
68 70
         $ss->assign('bean',$meetingBean->toArray());
69 71
         $ss->display($tplFile);
70 72
     }
71
-}else{
73
+} else{
72 74
     if(isset($row['id']) || $meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
73 75
       SugarApplication::redirect($meetingBean->join_url);
74
-    }else{
76
+    } else{
75 77
         //if the user is not invited or the owner of the meeting or an admin then they cannot join the meeting.
76 78
         $tplFile = 'modules/Meetings/tpls/extMeetingNotInvited.tpl';
77 79
         if ( file_exists('custom/'.$tplFile) ) {
Please login to merge, or discard this patch.
modules/Meetings/language/en_us.lang.php 3 patches
Indentation   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -47,75 +47,75 @@  discard block
 block discarded – undo
47 47
  ********************************************************************************/
48 48
 
49 49
 $mod_strings = array (
50
-	'ERR_DELETE_RECORD' => 'A record number must be specified to delete the meeting.',
50
+    'ERR_DELETE_RECORD' => 'A record number must be specified to delete the meeting.',
51 51
 
52
-	'LBL_ACCEPT_THIS'=>'Accept?',
53
-	'LBL_ADD_BUTTON'=> 'Add',
54
-	'LBL_ADD_INVITEE' => 'Add Invitees',
55
-	'LBL_COLON' => ':',
56
-	'LBL_CONTACT_NAME' => 'Contact:',
57
-	'LBL_CONTACTS_SUBPANEL_TITLE' => 'Contacts',
58
-	'LBL_CREATED_BY'=>'Created by',
59
-	'LBL_DATE_END'=>'End Date',
60
-	'LBL_DATE_TIME' => 'Start Date & Time:',
61
-	'LBL_DATE' => 'Start Date:',
62
-	'LBL_DEFAULT_SUBPANEL_TITLE' => 'Meetings',
63
-	'LBL_DEL'=> 'Del',
64
-	'LBL_DESCRIPTION_INFORMATION' => 'Description Information',
65
-	'LBL_DESCRIPTION' => 'Description:',
52
+    'LBL_ACCEPT_THIS'=>'Accept?',
53
+    'LBL_ADD_BUTTON'=> 'Add',
54
+    'LBL_ADD_INVITEE' => 'Add Invitees',
55
+    'LBL_COLON' => ':',
56
+    'LBL_CONTACT_NAME' => 'Contact:',
57
+    'LBL_CONTACTS_SUBPANEL_TITLE' => 'Contacts',
58
+    'LBL_CREATED_BY'=>'Created by',
59
+    'LBL_DATE_END'=>'End Date',
60
+    'LBL_DATE_TIME' => 'Start Date & Time:',
61
+    'LBL_DATE' => 'Start Date:',
62
+    'LBL_DEFAULT_SUBPANEL_TITLE' => 'Meetings',
63
+    'LBL_DEL'=> 'Del',
64
+    'LBL_DESCRIPTION_INFORMATION' => 'Description Information',
65
+    'LBL_DESCRIPTION' => 'Description:',
66 66
     'LBL_DIRECTION' => 'Direction:',
67
-	'LBL_DURATION_HOURS' => 'Duration Hours:',
68
-	'LBL_DURATION_MINUTES' => 'Duration Minutes:',
69
-	'LBL_DURATION' => 'Duration:',
70
-	'LBL_EMAIL' => 'Email',
71
-	'LBL_FIRST_NAME' => 'First Name',
72
-	'LBL_HISTORY_SUBPANEL_TITLE' => 'Notes',
73
-	'LBL_HOURS_ABBREV' => 'h',
74
-	'LBL_HOURS_MINS' => '(hours/minutes)',
75
-	'LBL_INVITEE' => 'Invitees',
76
-	'LBL_LAST_NAME' => 'Last Name',
77
-	'LBL_ASSIGNED_TO_NAME'=>'Assigned to:',
78
-	'LBL_LIST_ASSIGNED_TO_NAME' => 'Assigned User',
79
-	'LBL_LIST_CLOSE' => 'Close',
80
-	'LBL_LIST_CONTACT' => 'Contact',
81
-	'LBL_LIST_DATE_MODIFIED'=>'Date Modified',
82
-	'LBL_LIST_DATE' => 'Start Date',
83
-	'LBL_LIST_DIRECTION' => 'Direction',
84
-	'LBL_LIST_DUE_DATE'=>'Due Date',
85
-	'LBL_LIST_FORM_TITLE' => 'Meeting List',
86
-	'LBL_LIST_MY_MEETINGS' => 'My Meetings',
87
-	'LBL_LIST_RELATED_TO' => 'Related to',
88
-	'LBL_LIST_STATUS'=>'Status',
89
-	'LBL_LIST_SUBJECT' => 'Subject',
90
-	'LBL_LIST_TIME' => 'Start Time',
91
-	'LBL_LEADS_SUBPANEL_TITLE' => 'Leads',
92
-	'LBL_LOCATION' => 'Location:',
93
-	'LBL_MEETING' => 'Meeting:',
94
-	'LBL_MINSS_ABBREV' => 'm',
95
-	'LBL_MODIFIED_BY'=>'Modified by',
96
-	'LBL_MODULE_NAME' => 'Meetings',
97
-	'LBL_MODULE_TITLE' => 'Meetings: Home',
98
-	'LBL_NAME' => 'Name',
99
-	'LBL_NEW_FORM_TITLE' => 'Create Appointment',
100
-	'LBL_OUTLOOK_ID' => 'Outlook ID',
101
-	'LBL_SEQUENCE' => 'Meeting update sequence',
102
-	'LBL_PHONE' => 'Phone Office:',
103
-	'LBL_REMINDER_TIME'=>'Reminder Time',
67
+    'LBL_DURATION_HOURS' => 'Duration Hours:',
68
+    'LBL_DURATION_MINUTES' => 'Duration Minutes:',
69
+    'LBL_DURATION' => 'Duration:',
70
+    'LBL_EMAIL' => 'Email',
71
+    'LBL_FIRST_NAME' => 'First Name',
72
+    'LBL_HISTORY_SUBPANEL_TITLE' => 'Notes',
73
+    'LBL_HOURS_ABBREV' => 'h',
74
+    'LBL_HOURS_MINS' => '(hours/minutes)',
75
+    'LBL_INVITEE' => 'Invitees',
76
+    'LBL_LAST_NAME' => 'Last Name',
77
+    'LBL_ASSIGNED_TO_NAME'=>'Assigned to:',
78
+    'LBL_LIST_ASSIGNED_TO_NAME' => 'Assigned User',
79
+    'LBL_LIST_CLOSE' => 'Close',
80
+    'LBL_LIST_CONTACT' => 'Contact',
81
+    'LBL_LIST_DATE_MODIFIED'=>'Date Modified',
82
+    'LBL_LIST_DATE' => 'Start Date',
83
+    'LBL_LIST_DIRECTION' => 'Direction',
84
+    'LBL_LIST_DUE_DATE'=>'Due Date',
85
+    'LBL_LIST_FORM_TITLE' => 'Meeting List',
86
+    'LBL_LIST_MY_MEETINGS' => 'My Meetings',
87
+    'LBL_LIST_RELATED_TO' => 'Related to',
88
+    'LBL_LIST_STATUS'=>'Status',
89
+    'LBL_LIST_SUBJECT' => 'Subject',
90
+    'LBL_LIST_TIME' => 'Start Time',
91
+    'LBL_LEADS_SUBPANEL_TITLE' => 'Leads',
92
+    'LBL_LOCATION' => 'Location:',
93
+    'LBL_MEETING' => 'Meeting:',
94
+    'LBL_MINSS_ABBREV' => 'm',
95
+    'LBL_MODIFIED_BY'=>'Modified by',
96
+    'LBL_MODULE_NAME' => 'Meetings',
97
+    'LBL_MODULE_TITLE' => 'Meetings: Home',
98
+    'LBL_NAME' => 'Name',
99
+    'LBL_NEW_FORM_TITLE' => 'Create Appointment',
100
+    'LBL_OUTLOOK_ID' => 'Outlook ID',
101
+    'LBL_SEQUENCE' => 'Meeting update sequence',
102
+    'LBL_PHONE' => 'Phone Office:',
103
+    'LBL_REMINDER_TIME'=>'Reminder Time',
104 104
     'LBL_EMAIL_REMINDER_SENT' => 'Email reminder sent',
105
-	'LBL_REMINDER' => 'Reminders:',
106
-	'LBL_REMINDER_POPUP' => 'Popup',
107
-	'LBL_REMINDER_EMAIL' => 'Email',
105
+    'LBL_REMINDER' => 'Reminders:',
106
+    'LBL_REMINDER_POPUP' => 'Popup',
107
+    'LBL_REMINDER_EMAIL' => 'Email',
108 108
     'LBL_REMINDER_EMAIL_ALL_INVITEES' => 'Email all invitees',
109 109
     'LBL_EMAIL_REMINDER' => 'Email Reminder',
110 110
     'LBL_EMAIL_REMINDER_TIME' => 'Email Reminder Time',
111 111
     'LBL_REMOVE' => 'rem',
112
-	'LBL_SCHEDULING_FORM_TITLE' => 'Scheduling',
113
-	'LBL_SEARCH_BUTTON'=> 'Search',
114
-	'LBL_SEARCH_FORM_TITLE' => 'Meeting Search',
115
-	'LBL_SEND_BUTTON_KEY'=>'I',
116
-	'LBL_SEND_BUTTON_LABEL'=>'Save & Send Invites',
117
-	'LBL_SEND_BUTTON_TITLE'=>'Save & Send Invites',
118
-	'LBL_STATUS' => 'Status:',
112
+    'LBL_SCHEDULING_FORM_TITLE' => 'Scheduling',
113
+    'LBL_SEARCH_BUTTON'=> 'Search',
114
+    'LBL_SEARCH_FORM_TITLE' => 'Meeting Search',
115
+    'LBL_SEND_BUTTON_KEY'=>'I',
116
+    'LBL_SEND_BUTTON_LABEL'=>'Save & Send Invites',
117
+    'LBL_SEND_BUTTON_TITLE'=>'Save & Send Invites',
118
+    'LBL_STATUS' => 'Status:',
119 119
     'LBL_TYPE' => 'Meeting Type',
120 120
     'LBL_PASSWORD' => 'Meeting Password',
121 121
     'LBL_URL' => 'Start/Join Meeting',
@@ -123,25 +123,25 @@  discard block
 block discarded – undo
123 123
     'LBL_DISPLAYED_URL' => 'Display URL',
124 124
     'LBL_CREATOR' => 'Meeting Creator',
125 125
     'LBL_EXTERNALID' => 'External App ID',
126
-	'LBL_SUBJECT' => 'Subject:',
127
-	'LBL_TIME' => 'Start Time:',
128
-	'LBL_USERS_SUBPANEL_TITLE' => 'Users',
129
-	'LBL_ACTIVITIES_REPORTS' => 'Activities Report',
126
+    'LBL_SUBJECT' => 'Subject:',
127
+    'LBL_TIME' => 'Start Time:',
128
+    'LBL_USERS_SUBPANEL_TITLE' => 'Users',
129
+    'LBL_ACTIVITIES_REPORTS' => 'Activities Report',
130 130
     'LBL_PARENT_TYPE' => 'Parent Type',
131 131
     'LBL_PARENT_ID' => 'Parent ID',
132
-	'LNK_MEETING_LIST'=>'View Meetings',
133
-	'LNK_NEW_APPOINTMENT' => 'Create Appointment',
134
-	'LNK_NEW_MEETING'=>'Schedule Meeting',
135
-	'LNK_IMPORT_MEETINGS' => 'Import Meetings',
132
+    'LNK_MEETING_LIST'=>'View Meetings',
133
+    'LNK_NEW_APPOINTMENT' => 'Create Appointment',
134
+    'LNK_NEW_MEETING'=>'Schedule Meeting',
135
+    'LNK_IMPORT_MEETINGS' => 'Import Meetings',
136 136
 
137
-	'NTC_REMOVE_INVITEE' => 'Are you sure you want to remove this invitee from the meeting?',
137
+    'NTC_REMOVE_INVITEE' => 'Are you sure you want to remove this invitee from the meeting?',
138 138
     'LBL_CREATED_USER' => 'Created User',
139 139
     'LBL_MODIFIED_USER' => 'Modified User',
140 140
     'NOTICE_DURATION_TIME' => 'Duration time must be greater than 0',
141 141
     'LBL_MEETING_INFORMATION' => 'Overview',
142
-	'LBL_LIST_JOIN_MEETING' => 'Join Meeting',
143
-	'LBL_JOIN_EXT_MEETING' => 'Join Meeting',
144
-	'LBL_HOST_EXT_MEETING' => 'Start Meeting',
142
+    'LBL_LIST_JOIN_MEETING' => 'Join Meeting',
143
+    'LBL_JOIN_EXT_MEETING' => 'Join Meeting',
144
+    'LBL_HOST_EXT_MEETING' => 'Start Meeting',
145 145
     'LBL_ACCEPT_STATUS' => 'Accept Status',
146 146
     'LBL_ACCEPT_LINK' => 'Accept Link',
147 147
     // You are not invited to the meeting messages
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
     'LBL_EXTNOSTART_HEADER' => 'Error: Cannot Start Meeting',
155 155
     'LBL_EXTNOSTART_MAIN' => 'You cannot start this meeting because you are not an Administrator or the owner of the meeting.',
156 156
 
157
-  //For export labels
157
+    //For export labels
158 158
     'LBL_EXPORT_JOIN_URL' => 'Join Url',
159 159
     'LBL_EXPORT_HOST_URL' => 'Host Url',
160 160
     'LBL_EXPORT_DISPLAYED_URL' => 'Displayed Url',
@@ -190,14 +190,14 @@  discard block
 block discarded – undo
190 190
     'LBL_SYNCED_RECURRING_MSG' => 'This meeting originated in another system and was synced to SuiteCRM. To make changes, go to the original meeting within the other system. Changes made in the other system can be synced to this record.',
191 191
     'LBL_RELATED_TO' => 'Related to:',
192 192
 
193
-	// for reminders
194
-	'LBL_REMINDERS' => 'Reminders',
195
-	'LBL_REMINDERS_ACTIONS' => 'Actions:',
196
-	'LBL_REMINDERS_POPUP' => 'Popup',
197
-	'LBL_REMINDERS_EMAIL' => 'Email invitees',
198
-	'LBL_REMINDERS_WHEN' => 'When:',
199
-	'LBL_REMINDERS_REMOVE_REMINDER' => 'Remove reminder',
200
-	'LBL_REMINDERS_ADD_ALL_INVITEES' => 'Add All Invitees',
201
-	'LBL_REMINDERS_ADD_REMINDER' => 'Add reminder',
193
+    // for reminders
194
+    'LBL_REMINDERS' => 'Reminders',
195
+    'LBL_REMINDERS_ACTIONS' => 'Actions:',
196
+    'LBL_REMINDERS_POPUP' => 'Popup',
197
+    'LBL_REMINDERS_EMAIL' => 'Email invitees',
198
+    'LBL_REMINDERS_WHEN' => 'When:',
199
+    'LBL_REMINDERS_REMOVE_REMINDER' => 'Remove reminder',
200
+    'LBL_REMINDERS_ADD_ALL_INVITEES' => 'Add All Invitees',
201
+    'LBL_REMINDERS_ADD_REMINDER' => 'Add reminder',
202 202
 );
203 203
 ?>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
39 39
  ********************************************************************************/
40 40
 
41
-$mod_strings = array (
41
+$mod_strings = array(
42 42
 'LBL_MODULE_NAME' => 'Roles',
43 43
 'LBL_MODULE_TITLE' => 'Roles: Home',
44 44
 'LBL_ROLE'=>'Role',
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
Please login to merge, or discard this patch.
modules/Meetings/MeetingsQuickCreate.php 3 patches
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -54,9 +54,9 @@  discard block
 block discarded – undo
54 54
         parent::process();
55 55
 
56 56
         $this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['meeting_status_dom'], $app_list_strings['meeting_status_default']));
57
-		$this->ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
58
-		$this->ss->assign("TIME_FORMAT", '('. $timedate->get_user_time_format().')');
59
-		$this->ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
57
+        $this->ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
58
+        $this->ss->assign("TIME_FORMAT", '('. $timedate->get_user_time_format().')');
59
+        $this->ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
60 60
 		
61 61
 
62 62
 
@@ -75,52 +75,52 @@  discard block
 block discarded – undo
75 75
         $this->javascript->setSugarBean($focus);
76 76
         $this->javascript->addAllFields('');
77 77
 
78
-		if (is_null($focus->date_start))
79
-			$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
80
-		if (is_null($focus->time_start))
81
-			$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
82
-		if (!isset ($focus->duration_hours))
83
-			$focus->duration_hours = "1";
78
+        if (is_null($focus->date_start))
79
+            $focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
80
+        if (is_null($focus->time_start))
81
+            $focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
82
+        if (!isset ($focus->duration_hours))
83
+            $focus->duration_hours = "1";
84 84
 
85 85
         
86 86
         $date_start_array=explode(" ",trim($focus->date_start));
87 87
         if (count($date_start_array)==2) {
88
-			$focus->time_start = $timedate->to_db_time($date_start_array[1], false);
89
-        	//$focus->date_start = $date_start_array[0];
88
+            $focus->time_start = $timedate->to_db_time($date_start_array[1], false);
89
+            //$focus->date_start = $date_start_array[0];
90 90
         }
91 91
 
92
-		$this->ss->assign("DATE_START", $focus->date_start);
93
-		$this->ss->assign("TIME_START", substr($focus->time_start,0,5));
94
-		$time_start_hour = intval(substr($focus->time_start, 0, 2));
95
-		$time_start_minutes = substr($focus->time_start, 3, 5);
92
+        $this->ss->assign("DATE_START", $focus->date_start);
93
+        $this->ss->assign("TIME_START", substr($focus->time_start,0,5));
94
+        $time_start_hour = intval(substr($focus->time_start, 0, 2));
95
+        $time_start_minutes = substr($focus->time_start, 3, 5);
96 96
 		
97
-		if ($time_start_minutes > 0 && $time_start_minutes < 15) {
98
-			$time_start_minutes = "15";
99
-		} else
100
-			if ($time_start_minutes > 15 && $time_start_minutes < 30) {
101
-				$time_start_minutes = "30";
102
-			} else
103
-				if ($time_start_minutes > 30 && $time_start_minutes < 45) {
104
-					$time_start_minutes = "45";
105
-				} else
106
-					if ($time_start_minutes > 45) {
107
-						$time_start_hour += 1;
108
-						$time_start_minutes = "00";
109
-					}
97
+        if ($time_start_minutes > 0 && $time_start_minutes < 15) {
98
+            $time_start_minutes = "15";
99
+        } else
100
+            if ($time_start_minutes > 15 && $time_start_minutes < 30) {
101
+                $time_start_minutes = "30";
102
+            } else
103
+                if ($time_start_minutes > 30 && $time_start_minutes < 45) {
104
+                    $time_start_minutes = "45";
105
+                } else
106
+                    if ($time_start_minutes > 45) {
107
+                        $time_start_hour += 1;
108
+                        $time_start_minutes = "00";
109
+                    }
110 110
 		
111 111
 		
112
-		// We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
113
-		$hours_arr = array ();
114
-		$num_of_hours = 24;
115
-		$start_at = 0;
112
+        // We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
113
+        $hours_arr = array ();
114
+        $num_of_hours = 24;
115
+        $start_at = 0;
116 116
 
117
-		$time_pref = $timedate->get_time_format();
118
-		if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
119
-		   $num_of_hours = 13;
120
-		   $start_at = 1;	
121
-		} 
117
+        $time_pref = $timedate->get_time_format();
118
+        if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
119
+            $num_of_hours = 13;
120
+            $start_at = 1;	
121
+        } 
122 122
 		
123
-		/*
123
+        /*
124 124
 		// Seems to be problematic... $time_meridiem is always empty
125 125
 		if (empty ($time_meridiem)) {
126 126
 			$num_of_hours = 24;
@@ -128,37 +128,37 @@  discard block
 block discarded – undo
128 128
 		}
129 129
 		*/
130 130
 		
131
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
132
-			$i = $i."";
133
-			if (strlen($i) == 1) {
134
-				$i = "0".$i;
135
-			}
136
-			$hours_arr[$i] = $i;
137
-		}
131
+        for ($i = $start_at; $i < $num_of_hours; $i ++) {
132
+            $i = $i."";
133
+            if (strlen($i) == 1) {
134
+                $i = "0".$i;
135
+            }
136
+            $hours_arr[$i] = $i;
137
+        }
138 138
 
139 139
         $this->ss->assign("TIME_START_HOUR_OPTIONS", get_select_options_with_id($hours_arr, $time_start_hour));
140
-		$this->ss->assign("TIME_START_MINUTE_OPTIONS", get_select_options_with_id($focus->minutes_values, $time_start_minutes));
141
-		$this->ss->assign("DURATION_HOURS", $focus->duration_hours);
142
-		$this->ss->assign("DURATION_MINUTES_OPTIONS", get_select_options_with_id($focus->minutes_values, $focus->duration_minutes));
140
+        $this->ss->assign("TIME_START_MINUTE_OPTIONS", get_select_options_with_id($focus->minutes_values, $time_start_minutes));
141
+        $this->ss->assign("DURATION_HOURS", $focus->duration_hours);
142
+        $this->ss->assign("DURATION_MINUTES_OPTIONS", get_select_options_with_id($focus->minutes_values, $focus->duration_minutes));
143 143
         // Test to see if time format is 11:00am; otherwise it's 11:00AM 
144 144
         if($num_of_hours == 13) {    
145 145
         		
146
-		   if (strpos($time_pref, 'a')) {
146
+            if (strpos($time_pref, 'a')) {
147 147
 		   	   
148
-               if(!isset($focus->meridiem_am_values)) {
149
-                  $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
150
-               } 		
148
+                if(!isset($focus->meridiem_am_values)) {
149
+                    $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
150
+                } 		
151 151
                
152
-               $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
152
+                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
153 153
                
154
-		   } else {
155
-		       if(!isset($focus->meridiem_AM_values)) {
156
-		          $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
157
-		       }
154
+            } else {
155
+                if(!isset($focus->meridiem_AM_values)) {
156
+                    $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
157
+                }
158 158
 		       
159
-		       $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_AM_values, $time_start_hour < 12 ? 'AM' : 'PM'));
159
+                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_AM_values, $time_start_hour < 12 ? 'AM' : 'PM'));
160 160
                
161
-		   } //if-else
161
+            } //if-else
162 162
            
163 163
         }
164 164
 
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
 
56 56
         $this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['meeting_status_dom'], $app_list_strings['meeting_status_default']));
57 57
 		$this->ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
58
-		$this->ss->assign("TIME_FORMAT", '('. $timedate->get_user_time_format().')');
59
-		$this->ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
58
+		$this->ss->assign("TIME_FORMAT", '('.$timedate->get_user_time_format().')');
59
+		$this->ss->assign("USER_DATEFORMAT", '('.$timedate->get_user_date_format().')');
60 60
 		
61 61
 
62 62
 
63 63
         
64
-        if($this->viaAJAX) { // override for ajax call
64
+        if ($this->viaAJAX) { // override for ajax call
65 65
             $this->ss->assign('saveOnclick', "onclick='if(check_form(\"meetingsQuickCreate\")) return SUGAR.subpanelUtils.inlineSave(this.form.id, \"activities\"); else return false;'");
66 66
             $this->ss->assign('cancelOnclick', "onclick='return SUGAR.subpanelUtils.cancelCreate(\"subpanel_activities\")';");
67 67
         }
@@ -83,14 +83,14 @@  discard block
 block discarded – undo
83 83
 			$focus->duration_hours = "1";
84 84
 
85 85
         
86
-        $date_start_array=explode(" ",trim($focus->date_start));
87
-        if (count($date_start_array)==2) {
86
+        $date_start_array = explode(" ", trim($focus->date_start));
87
+        if (count($date_start_array) == 2) {
88 88
 			$focus->time_start = $timedate->to_db_time($date_start_array[1], false);
89 89
         	//$focus->date_start = $date_start_array[0];
90 90
         }
91 91
 
92 92
 		$this->ss->assign("DATE_START", $focus->date_start);
93
-		$this->ss->assign("TIME_START", substr($focus->time_start,0,5));
93
+		$this->ss->assign("TIME_START", substr($focus->time_start, 0, 5));
94 94
 		$time_start_hour = intval(substr($focus->time_start, 0, 2));
95 95
 		$time_start_minutes = substr($focus->time_start, 3, 5);
96 96
 		
@@ -110,12 +110,12 @@  discard block
 block discarded – undo
110 110
 		
111 111
 		
112 112
 		// We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
113
-		$hours_arr = array ();
113
+		$hours_arr = array();
114 114
 		$num_of_hours = 24;
115 115
 		$start_at = 0;
116 116
 
117 117
 		$time_pref = $timedate->get_time_format();
118
-		if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
118
+		if (strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
119 119
 		   $num_of_hours = 13;
120 120
 		   $start_at = 1;	
121 121
 		} 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		}
129 129
 		*/
130 130
 		
131
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
131
+		for ($i = $start_at; $i < $num_of_hours; $i++) {
132 132
 			$i = $i."";
133 133
 			if (strlen($i) == 1) {
134 134
 				$i = "0".$i;
@@ -141,18 +141,18 @@  discard block
 block discarded – undo
141 141
 		$this->ss->assign("DURATION_HOURS", $focus->duration_hours);
142 142
 		$this->ss->assign("DURATION_MINUTES_OPTIONS", get_select_options_with_id($focus->minutes_values, $focus->duration_minutes));
143 143
         // Test to see if time format is 11:00am; otherwise it's 11:00AM 
144
-        if($num_of_hours == 13) {    
144
+        if ($num_of_hours == 13) {    
145 145
         		
146 146
 		   if (strpos($time_pref, 'a')) {
147 147
 		   	   
148
-               if(!isset($focus->meridiem_am_values)) {
148
+               if (!isset($focus->meridiem_am_values)) {
149 149
                   $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
150 150
                } 		
151 151
                
152 152
                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
153 153
                
154 154
 		   } else {
155
-		       if(!isset($focus->meridiem_AM_values)) {
155
+		       if (!isset($focus->meridiem_AM_values)) {
156 156
 		          $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
157 157
 		       }
158 158
 		       
Please login to merge, or discard this patch.
Braces   +12 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -75,12 +77,15 @@  discard block
 block discarded – undo
75 77
         $this->javascript->setSugarBean($focus);
76 78
         $this->javascript->addAllFields('');
77 79
 
78
-		if (is_null($focus->date_start))
79
-			$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
80
-		if (is_null($focus->time_start))
81
-			$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
82
-		if (!isset ($focus->duration_hours))
83
-			$focus->duration_hours = "1";
80
+		if (is_null($focus->date_start)) {
81
+					$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
82
+		}
83
+		if (is_null($focus->time_start)) {
84
+					$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
85
+		}
86
+		if (!isset ($focus->duration_hours)) {
87
+					$focus->duration_hours = "1";
88
+		}
84 89
 
85 90
         
86 91
         $date_start_array=explode(" ",trim($focus->date_start));
Please login to merge, or discard this patch.
modules/Meetings/SubPanelViewInvitees.php 3 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -79,14 +79,14 @@  discard block
 block discarded – undo
79 79
 
80 80
 // Stick the form header out there.
81 81
 echo get_form_header($mod_strings['LBL_INVITEE'], $button, false);
82
-$xtpl=new XTemplate ('modules/Meetings/SubPanelViewInvitees.html');
82
+$xtpl = new XTemplate('modules/Meetings/SubPanelViewInvitees.html');
83 83
 $xtpl->assign("MOD", $mod_strings);
84 84
 $xtpl->assign("APP", $app_strings);
85 85
 $xtpl->assign("RETURN_URL", "&return_module=$currentModule&return_action=DetailView&return_id=$focus->id");
86 86
 $xtpl->assign("MEETING_ID", $focus->id);
87 87
 
88 88
 $oddRow = true;
89
-foreach($focus_users_list as $user)
89
+foreach ($focus_users_list as $user)
90 90
 {
91 91
 	$user_fields = array(
92 92
 		'USER_NAME' => $user->user_name,
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 	$xtpl->assign("USER", $user_fields);
100 100
 
101
-	if($oddRow)
101
+	if ($oddRow)
102 102
     {
103 103
         //todo move to themes
104 104
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 $xtpl->out("users");
119 119
 
120 120
 $oddRow = true;
121
-foreach($focus_contacts_list as $contact)
121
+foreach ($focus_contacts_list as $contact)
122 122
 {
123 123
 	$contact_fields = array(
124 124
 		'FIRST_NAME' => $contact->first_name,
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 
132 132
 	$xtpl->assign("CONTACT", $contact_fields);
133 133
 
134
-	if($oddRow)
134
+	if ($oddRow)
135 135
     {
136 136
         //todo move to themes
137 137
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
Please login to merge, or discard this patch.
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -88,29 +88,29 @@  discard block
 block discarded – undo
88 88
 $oddRow = true;
89 89
 foreach($focus_users_list as $user)
90 90
 {
91
-	$user_fields = array(
92
-		'USER_NAME' => $user->user_name,
93
-		'FULL_NAME' => $locale->getLocaleFormattedName($user->first_name, $user->last_name),
94
-		'ID' => $user->id,
95
-		'EMAIL' => $user->email1,
96
-		'PHONE_WORK' => $user->phone_work
97
-	);
91
+    $user_fields = array(
92
+        'USER_NAME' => $user->user_name,
93
+        'FULL_NAME' => $locale->getLocaleFormattedName($user->first_name, $user->last_name),
94
+        'ID' => $user->id,
95
+        'EMAIL' => $user->email1,
96
+        'PHONE_WORK' => $user->phone_work
97
+    );
98 98
 
99
-	$xtpl->assign("USER", $user_fields);
99
+    $xtpl->assign("USER", $user_fields);
100 100
 
101
-	if($oddRow)
101
+    if($oddRow)
102 102
     {
103 103
         //todo move to themes
104
-		$xtpl->assign("ROW_COLOR", 'oddListRow');
104
+        $xtpl->assign("ROW_COLOR", 'oddListRow');
105 105
     }
106 106
     else
107 107
     {
108 108
         //todo move to themes
109
-		$xtpl->assign("ROW_COLOR", 'evenListRow');
109
+        $xtpl->assign("ROW_COLOR", 'evenListRow');
110 110
     }
111 111
     $oddRow = !$oddRow;
112 112
 
113
-	$xtpl->parse("users.row");
113
+    $xtpl->parse("users.row");
114 114
 // Put the rows in.
115 115
 }
116 116
 
@@ -120,30 +120,30 @@  discard block
 block discarded – undo
120 120
 $oddRow = true;
121 121
 foreach($focus_contacts_list as $contact)
122 122
 {
123
-	$contact_fields = array(
124
-		'FIRST_NAME' => $contact->first_name,
125
-		'LAST_NAME' => $contact->last_name,
126
-		'ACCOUNT_NAME' => $contact->account_name,
127
-		'ID' => $contact->id,
128
-		'EMAIL' => $contact->email1,
129
-		'PHONE_WORK' => $contact->phone_work
130
-	);
131
-
132
-	$xtpl->assign("CONTACT", $contact_fields);
133
-
134
-	if($oddRow)
123
+    $contact_fields = array(
124
+        'FIRST_NAME' => $contact->first_name,
125
+        'LAST_NAME' => $contact->last_name,
126
+        'ACCOUNT_NAME' => $contact->account_name,
127
+        'ID' => $contact->id,
128
+        'EMAIL' => $contact->email1,
129
+        'PHONE_WORK' => $contact->phone_work
130
+    );
131
+
132
+    $xtpl->assign("CONTACT", $contact_fields);
133
+
134
+    if($oddRow)
135 135
     {
136 136
         //todo move to themes
137
-		$xtpl->assign("ROW_COLOR", 'oddListRow');
137
+        $xtpl->assign("ROW_COLOR", 'oddListRow');
138 138
     }
139 139
     else
140 140
     {
141 141
         //todo move to themes
142
-		$xtpl->assign("ROW_COLOR", 'evenListRow');
142
+        $xtpl->assign("ROW_COLOR", 'evenListRow');
143 143
     }
144 144
     $oddRow = !$oddRow;
145 145
 
146
-	$xtpl->parse("contacts.row");
146
+    $xtpl->parse("contacts.row");
147 147
 // Put the rows in.
148 148
 }
149 149
 
Please login to merge, or discard this patch.
Braces   +13 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -65,14 +67,19 @@  discard block
 block discarded – undo
65 67
 
66 68
 $button  = "<table cellspacing='0' cellpadding='1' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
67 69
 $button .= "<input type='hidden' name='module' value='Contacts'>\n";
68
-if ($currentModule == 'Accounts') $button .= "<input type='hidden' name='account_id' value='$focus->id'>\n<input type='hidden' name='account_name' value='$focus->name'>\n";
70
+if ($currentModule == 'Accounts') {
71
+    $button .= "<input type='hidden' name='account_id' value='$focus->id'>\n<input type='hidden' name='account_name' value='$focus->name'>\n";
72
+}
69 73
 $button .= "<input type='hidden' name='return_module' value='".$currentModule."'>\n";
70 74
 $button .= "<input type='hidden' name='return_action' value='".$action."'>\n";
71 75
 $button .= "<input type='hidden' name='return_id' value='".$focus->id."'>\n";
72 76
 $button .= "<input type='hidden' name='action'>\n";
73 77
 $button .= "<tr><td>&nbsp;</td>";
74
-if ($focus->parent_type == "Accounts") $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."' type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)."\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
75
-else $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."'  type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
78
+if ($focus->parent_type == "Accounts") {
79
+    $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."' type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true&query=true&account_id=$focus->parent_id&account_name=".urlencode($focus->parent_name)."\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
80
+} else {
81
+    $button .= "<td><input title='".$app_strings['LBL_SELECT_CONTACT_BUTTON_TITLE']."'  type='button' class='button' value='".$app_strings['LBL_SELECT_CONTACT_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Contacts&action=Popup&html=Popup_picker&form=DetailView&form_submit=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
82
+}
76 83
 $button .= "<td><input title='".$app_strings['LBL_SELECT_USER_BUTTON_TITLE']."'  type='button' class='button' value='".$app_strings['LBL_SELECT_USER_BUTTON_LABEL']."' name='button' LANGUAGE=javascript onclick='window.open(\"index.php?module=Users&action=Popup&html=Popup_picker&form=DetailView&form_submit=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'></td>\n";
77 84
 $button .= "</tr></form></table>\n";
78 85
 
@@ -102,8 +109,7 @@  discard block
 block discarded – undo
102 109
     {
103 110
         //todo move to themes
104 111
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
105
-    }
106
-    else
112
+    } else
107 113
     {
108 114
         //todo move to themes
109 115
 		$xtpl->assign("ROW_COLOR", 'evenListRow');
@@ -135,8 +141,7 @@  discard block
 block discarded – undo
135 141
     {
136 142
         //todo move to themes
137 143
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
138
-    }
139
-    else
144
+    } else
140 145
     {
141 146
         //todo move to themes
142 147
 		$xtpl->assign("ROW_COLOR", 'evenListRow');
Please login to merge, or discard this patch.
modules/Meetings/metadata/additionalDetails.php 2 patches
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 function additionalDetailsMeeting($fields) {
43 43
     global $timedate;
44 44
     static $mod_strings;
45
-    if(empty($mod_strings)) {
45
+    if (empty($mod_strings)) {
46 46
         global $current_language;
47 47
         $mod_strings = return_module_language($current_language, 'Meetings');
48 48
     }
@@ -50,51 +50,51 @@  discard block
 block discarded – undo
50 50
 //    print_r($fields);
51 51
     $overlib_string = '';
52 52
     $overlib_string .= '<input id="type" type="hidden" value="Meeting"/>';
53
-    if(!empty($fields['ID'])) {
54
-        $overlib_string .= '<input id="id" type="hidden" value="'. $fields['ID'];
53
+    if (!empty($fields['ID'])) {
54
+        $overlib_string .= '<input id="id" type="hidden" value="'.$fields['ID'];
55 55
         $overlib_string .= '"/>';
56 56
     }
57 57
 
58
-    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Meetings.gif"/> '.$mod_strings['LBL_MEETING'].'</h2>';
58
+    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName='.SugarThemeRegistry::current()->name.'&imageName=Meetings.gif"/> '.$mod_strings['LBL_MEETING'].'</h2>';
59 59
 
60
-    if(!empty($fields['NAME'])) {
61
-        $overlib_string .= '<b>'.$mod_strings['LBL_SUBJECT'].'</b> <a href="index.php?action=DetailView&module=Meetings&record='.$fields['ID'].'">'. $fields['NAME'] . '</a>';
60
+    if (!empty($fields['NAME'])) {
61
+        $overlib_string .= '<b>'.$mod_strings['LBL_SUBJECT'].'</b> <a href="index.php?action=DetailView&module=Meetings&record='.$fields['ID'].'">'.$fields['NAME'].'</a>';
62 62
         $overlib_string .= '<br>';
63 63
     }
64
-    if(!empty($fields['DATE_START']))  {
64
+    if (!empty($fields['DATE_START'])) {
65 65
         // Make it easy to select for sorting in schedule bar
66 66
         $data_date = $timedate->fromUser($fields['DATE_START'])->format('Y-m-d H:i:s');
67 67
         $overlib_string .= '<span data-field="DATE_START" data-date="'.$data_date.'">';
68
-        $overlib_string .= '<b>'. $mod_strings['LBL_DATE_TIME'] . '</b> ' . $fields['DATE_START'] . ' <br>';
68
+        $overlib_string .= '<b>'.$mod_strings['LBL_DATE_TIME'].'</b> '.$fields['DATE_START'].' <br>';
69 69
         $overlib_string .= '</span>';
70 70
     }
71 71
 
72
-    if(isset($fields['DURATION_HOURS']) || isset($fields['DURATION_MINUTES'])) {
73
-        $overlib_string .= '<b>'. $mod_strings['LBL_DURATION'] . '</b> ';
74
-        if(isset($fields['DURATION_HOURS'])) {
75
-            $overlib_string .= $fields['DURATION_HOURS'] . $mod_strings['LBL_HOURS_ABBREV'] . ' ';
72
+    if (isset($fields['DURATION_HOURS']) || isset($fields['DURATION_MINUTES'])) {
73
+        $overlib_string .= '<b>'.$mod_strings['LBL_DURATION'].'</b> ';
74
+        if (isset($fields['DURATION_HOURS'])) {
75
+            $overlib_string .= $fields['DURATION_HOURS'].$mod_strings['LBL_HOURS_ABBREV'].' ';
76 76
         }
77
-        if(isset($fields['DURATION_MINUTES'])) {
78
-            $overlib_string .=  $fields['DURATION_MINUTES'] . $mod_strings['LBL_MINSS_ABBREV'];
77
+        if (isset($fields['DURATION_MINUTES'])) {
78
+            $overlib_string .= $fields['DURATION_MINUTES'].$mod_strings['LBL_MINSS_ABBREV'];
79 79
         }
80
-        $overlib_string .=  '<br>';
80
+        $overlib_string .= '<br>';
81 81
     }
82 82
     if (!empty($fields['PARENT_ID']))
83 83
     {
84
-        $overlib_string .= "<b>". $mod_strings['LBL_RELATED_TO'] . "</b> ".
84
+        $overlib_string .= "<b>".$mod_strings['LBL_RELATED_TO']."</b> ".
85 85
             "<a href='index.php?module=".$fields['PARENT_TYPE']."&action=DetailView&record=".$fields['PARENT_ID']."'>".
86
-            $fields['PARENT_TYPE'] .' - '. $fields['PARENT_NAME'] . "</a>";
86
+            $fields['PARENT_TYPE'].' - '.$fields['PARENT_NAME']."</a>";
87 87
         $overlib_string .= '<br>';
88 88
     }
89 89
 
90
-    if(!empty($fields['STATUS'])) {
91
-        $overlib_string .= '<b>'. $mod_strings['LBL_STATUS'] . '</b> ' . $fields['STATUS'];
90
+    if (!empty($fields['STATUS'])) {
91
+        $overlib_string .= '<b>'.$mod_strings['LBL_STATUS'].'</b> '.$fields['STATUS'];
92 92
         $overlib_string .= '<br>';
93 93
     }
94 94
 
95
-    if(!empty($fields['DESCRIPTION'])) {
96
-        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
97
-        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
95
+    if (!empty($fields['DESCRIPTION'])) {
96
+        $overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
97
+        if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
98 98
         $overlib_string .= '<br>';
99 99
     }
100 100
     $overlib_string .= '<br>';
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -94,7 +96,9 @@  discard block
 block discarded – undo
94 96
 
95 97
     if(!empty($fields['DESCRIPTION'])) {
96 98
         $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
97
-        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
99
+        if(strlen($fields['DESCRIPTION']) > 300) {
100
+            $overlib_string .= '...';
101
+        }
98 102
         $overlib_string .= '<br>';
99 103
     }
100 104
     $overlib_string .= '<br>';
Please login to merge, or discard this patch.
modules/Meetings/metadata/editviewdefs.php 2 patches
Indentation   +82 added lines, -82 removed lines patch added patch discarded remove patch
@@ -39,134 +39,134 @@  discard block
 block discarded – undo
39 39
 
40 40
 $viewdefs ['Meetings'] =
41 41
 array (
42
-  'EditView' =>
43
-  array (
42
+    'EditView' =>
43
+    array (
44 44
     'templateMeta' =>
45 45
     array (
46 46
         'includes' => array(
47 47
             array('file' => 'modules/Reminders/Reminders.js'),
48 48
         ),
49
-      'maxColumns' => '2',
50
-      'form' =>
51
-      array (
49
+        'maxColumns' => '2',
50
+        'form' =>
51
+        array (
52 52
         'hidden' =>
53 53
         array (
54
-          0 => '<input type="hidden" name="isSaveAndNew" value="false">',
54
+            0 => '<input type="hidden" name="isSaveAndNew" value="false">',
55 55
         ),
56 56
         'buttons' =>
57 57
         array (
58
-          0 =>
59
-          array (
60
-			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_HEADER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
61
-		  ),
62
-          1 => 'CANCEL',
63
-          2 =>
64
-          array (
65
-             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_header" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
66
-		  ),
67
-          3 => 
68
-          array (
58
+            0 =>
59
+            array (
60
+            'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_HEADER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
61
+            ),
62
+            1 => 'CANCEL',
63
+            2 =>
64
+            array (
65
+                'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_header" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
66
+            ),
67
+            3 => 
68
+            array (
69 69
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_header" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
70
-           ),
70
+            ),
71 71
         ),
72 72
         'headerTpl' => 'modules/Meetings/tpls/header.tpl',
73 73
 
74
-          'buttons_footer' =>
74
+            'buttons_footer' =>
75 75
         array (
76
-          0 =>
77
-          array (
78
-			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_FOOTER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
79
-		  ),
80
-          1 => 'CANCEL',
81
-          2 =>
82
-          array (
83
-             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_footer" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
84
-		  ),
85
-          3 =>
86
-          array (
76
+            0 =>
77
+            array (
78
+            'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_FOOTER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
79
+            ),
80
+            1 => 'CANCEL',
81
+            2 =>
82
+            array (
83
+                'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_footer" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
84
+            ),
85
+            3 =>
86
+            array (
87 87
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_footer" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
88
-           ),
88
+            ),
89 89
         ),
90 90
         'footerTpl' => 'modules/Meetings/tpls/footer.tpl',
91
-      ),
92
-      'widths' =>
93
-      array (
91
+        ),
92
+        'widths' =>
93
+        array (
94 94
         0 =>
95 95
         array (
96
-          'label' => '10',
97
-          'field' => '30',
96
+            'label' => '10',
97
+            'field' => '30',
98 98
         ),
99 99
         1 =>
100 100
         array (
101
-          'label' => '10',
102
-          'field' => '30',
101
+            'label' => '10',
102
+            'field' => '30',
103
+        ),
103 104
         ),
104
-      ),
105
-      'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
105
+        'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
106 106
 {sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}
107 107
 <script>toggle_portal_flag();function toggle_portal_flag()  {ldelim} {$TOGGLE_JS} {rdelim} 
108 108
 function formSubmitCheck(){ldelim}if(check_form(\'EditView\')){ldelim}document.EditView.submit();{rdelim}{rdelim}</script>',
109
-      'useTabs' => false,
109
+        'useTabs' => false,
110 110
     ),
111 111
     'panels' =>
112 112
     array (
113
-      'lbl_meeting_information' =>
114
-      array (
113
+        'lbl_meeting_information' =>
115 114
         array (
116
-          array (
115
+        array (
116
+            array (
117 117
             'name' => 'name',
118 118
 
119
-          ),
120
-          array (
119
+            ),
120
+            array (
121 121
             'name' => 'status',
122 122
             'fields' =>
123 123
             array (
124
-              array (
124
+                array (
125 125
                 'name' => 'status',
126
-              ),
126
+                ),
127
+            ),
127 128
             ),
128
-         ),
129
-      ),
129
+        ),
130 130
       
131 131
       
132
-      array (
133
-          array (
132
+        array (
133
+            array (
134 134
             'name' => 'date_start',
135 135
             'type' => 'datetimecombo',
136 136
             'displayParams' =>
137 137
             array (
138
-              'required' => true,
139
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
138
+                'required' => true,
139
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
140
+            ),
140 141
             ),
141
-          ),
142 142
           
143
-          array (
143
+            array (
144 144
             'name' => 'parent_name',
145 145
             'label' => 'LBL_LIST_RELATED_TO',
146
-          ),
146
+            ),
147 147
         ),
148 148
         
149 149
         
150
-      array (
151
-          array (
150
+        array (
151
+            array (
152 152
             'name' => 'date_end',
153 153
             'type' => 'datetimecombo',
154 154
             'displayParams' =>
155 155
             array (
156
-              'required' => true,
157
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
156
+                'required' => true,
157
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
158
+            ),
158 159
             ),
159
-          ),
160 160
           
161
-          array (
161
+            array (
162 162
             'name' => 'location',
163 163
             'comment' => 'Meeting location',
164 164
             'label' => 'LBL_LOCATION',
165
-          ),
165
+            ),
166 166
         ),      
167 167
         
168 168
         array(        
169
-          array (
169
+            array (
170 170
             'name' => 'duration',
171 171
             'customCode' => '
172 172
                 @@FIELD@@
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
                 </script>            
185 185
             ',
186 186
             'customCodeReadOnly' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
187
-          ),
187
+            ),
188 188
         ),
189 189
 //        array (
190 190
 //          array (
@@ -193,31 +193,31 @@  discard block
 block discarded – undo
193 193
 //            'label' => 'LBL_REMINDER',
194 194
 //          ),
195 195
 //        ),
196
-          array(
197
-              array (
198
-                  'name' => 'reminders',
199
-                  'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
200
-                  'label' => 'LBL_REMINDERS',
201
-              ),
202
-          ),
196
+            array(
197
+                array (
198
+                    'name' => 'reminders',
199
+                    'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
200
+                    'label' => 'LBL_REMINDERS',
201
+                ),
202
+            ),
203 203
         array (
204
-          array (
204
+            array (
205 205
             'name' => 'description',
206 206
             'comment' => 'Full text of the note',
207 207
             'label' => 'LBL_DESCRIPTION',
208
-          ),
208
+            ),
209
+        ),
209 210
         ),
210
-      ),
211
-      'LBL_PANEL_ASSIGNMENT' =>
212
-      array (
211
+        'LBL_PANEL_ASSIGNMENT' =>
213 212
         array (
214
-          array (
213
+        array (
214
+            array (
215 215
             'name' => 'assigned_user_name',
216 216
             'label' => 'LBL_ASSIGNED_TO_NAME',
217
-          ),
217
+            ),
218 218
         ),
219
-      ),
219
+        ),
220
+    ),
220 221
     ),
221
-  ),
222 222
 );
223 223
 ?>
Please login to merge, or discard this patch.
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -38,66 +38,66 @@  discard block
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 $viewdefs ['Meetings'] =
41
-array (
41
+array(
42 42
   'EditView' =>
43
-  array (
43
+  array(
44 44
     'templateMeta' =>
45
-    array (
45
+    array(
46 46
         'includes' => array(
47 47
             array('file' => 'modules/Reminders/Reminders.js'),
48 48
         ),
49 49
       'maxColumns' => '2',
50 50
       'form' =>
51
-      array (
51
+      array(
52 52
         'hidden' =>
53
-        array (
53
+        array(
54 54
           0 => '<input type="hidden" name="isSaveAndNew" value="false">',
55 55
         ),
56 56
         'buttons' =>
57
-        array (
57
+        array(
58 58
           0 =>
59
-          array (
59
+          array(
60 60
 			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_HEADER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
61 61
 		  ),
62 62
           1 => 'CANCEL',
63 63
           2 =>
64
-          array (
64
+          array(
65 65
              'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_header" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
66 66
 		  ),
67 67
           3 => 
68
-          array (
68
+          array(
69 69
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_header" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
70 70
            ),
71 71
         ),
72 72
         'headerTpl' => 'modules/Meetings/tpls/header.tpl',
73 73
 
74 74
           'buttons_footer' =>
75
-        array (
75
+        array(
76 76
           0 =>
77
-          array (
77
+          array(
78 78
 			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_FOOTER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
79 79
 		  ),
80 80
           1 => 'CANCEL',
81 81
           2 =>
82
-          array (
82
+          array(
83 83
              'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_footer" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
84 84
 		  ),
85 85
           3 =>
86
-          array (
86
+          array(
87 87
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_footer" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
88 88
            ),
89 89
         ),
90 90
         'footerTpl' => 'modules/Meetings/tpls/footer.tpl',
91 91
       ),
92 92
       'widths' =>
93
-      array (
93
+      array(
94 94
         0 =>
95
-        array (
95
+        array(
96 96
           'label' => '10',
97 97
           'field' => '30',
98 98
         ),
99 99
         1 =>
100
-        array (
100
+        array(
101 101
           'label' => '10',
102 102
           'field' => '30',
103 103
         ),
@@ -109,19 +109,19 @@  discard block
 block discarded – undo
109 109
       'useTabs' => false,
110 110
     ),
111 111
     'panels' =>
112
-    array (
112
+    array(
113 113
       'lbl_meeting_information' =>
114
-      array (
115
-        array (
116
-          array (
114
+      array(
115
+        array(
116
+          array(
117 117
             'name' => 'name',
118 118
 
119 119
           ),
120
-          array (
120
+          array(
121 121
             'name' => 'status',
122 122
             'fields' =>
123
-            array (
124
-              array (
123
+            array(
124
+              array(
125 125
                 'name' => 'status',
126 126
               ),
127 127
             ),
@@ -129,36 +129,36 @@  discard block
 block discarded – undo
129 129
       ),
130 130
       
131 131
       
132
-      array (
133
-          array (
132
+      array(
133
+          array(
134 134
             'name' => 'date_start',
135 135
             'type' => 'datetimecombo',
136 136
             'displayParams' =>
137
-            array (
137
+            array(
138 138
               'required' => true,
139 139
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
140 140
             ),
141 141
           ),
142 142
           
143
-          array (
143
+          array(
144 144
             'name' => 'parent_name',
145 145
             'label' => 'LBL_LIST_RELATED_TO',
146 146
           ),
147 147
         ),
148 148
         
149 149
         
150
-      array (
151
-          array (
150
+      array(
151
+          array(
152 152
             'name' => 'date_end',
153 153
             'type' => 'datetimecombo',
154 154
             'displayParams' =>
155
-            array (
155
+            array(
156 156
               'required' => true,
157 157
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
158 158
             ),
159 159
           ),
160 160
           
161
-          array (
161
+          array(
162 162
             'name' => 'location',
163 163
             'comment' => 'Meeting location',
164 164
             'label' => 'LBL_LOCATION',
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
         ),      
167 167
         
168 168
         array(        
169
-          array (
169
+          array(
170 170
             'name' => 'duration',
171 171
             'customCode' => '
172 172
                 @@FIELD@@
@@ -194,14 +194,14 @@  discard block
 block discarded – undo
194 194
 //          ),
195 195
 //        ),
196 196
           array(
197
-              array (
197
+              array(
198 198
                   'name' => 'reminders',
199 199
                   'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
200 200
                   'label' => 'LBL_REMINDERS',
201 201
               ),
202 202
           ),
203
-        array (
204
-          array (
203
+        array(
204
+          array(
205 205
             'name' => 'description',
206 206
             'comment' => 'Full text of the note',
207 207
             'label' => 'LBL_DESCRIPTION',
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
         ),
210 210
       ),
211 211
       'LBL_PANEL_ASSIGNMENT' =>
212
-      array (
213
-        array (
214
-          array (
212
+      array(
213
+        array(
214
+          array(
215 215
             'name' => 'assigned_user_name',
216 216
             'label' => 'LBL_ASSIGNED_TO_NAME',
217 217
           ),
Please login to merge, or discard this patch.
modules/Meetings/metadata/searchdefs.php 2 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -39,85 +39,85 @@
 block discarded – undo
39 39
 
40 40
 $searchdefs ['Meetings'] = 
41 41
 array (
42
-  'layout' => 
43
-  array (
42
+    'layout' => 
43
+    array (
44 44
     'basic_search' => 
45 45
     array (
46
-      'name' => 
47
-      array (
46
+        'name' => 
47
+        array (
48 48
         'name' => 'name',
49 49
         'default' => true,
50 50
         'width' => '10%',
51
-      ),
52
-      'current_user_only' => 
53
-      array (
51
+        ),
52
+        'current_user_only' => 
53
+        array (
54 54
         'name' => 'current_user_only',
55 55
         'label' => 'LBL_CURRENT_USER_FILTER',
56 56
         'type' => 'bool',
57 57
         'default' => true,
58 58
         'width' => '10%',
59
-      ),
60
-      array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
61
-      array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
59
+        ),
60
+        array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
61
+        array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
62 62
     ),
63 63
     'advanced_search' => 
64 64
     array (
65
-      'name' => 
66
-      array (
65
+        'name' => 
66
+        array (
67 67
         'name' => 'name',
68 68
         'default' => true,
69 69
         'width' => '10%',
70
-      ),
71
-      'parent_name' => 
72
-      array (
70
+        ),
71
+        'parent_name' => 
72
+        array (
73 73
         'type' => 'parent',
74 74
         'label' => 'LBL_LIST_RELATED_TO',
75 75
         'width' => '10%',
76 76
         'default' => true,
77 77
         'name' => 'parent_name',
78
-      ),
79
-      'current_user_only' => 
80
-      array (
78
+        ),
79
+        'current_user_only' => 
80
+        array (
81 81
         'name' => 'current_user_only',
82 82
         'label' => 'LBL_CURRENT_USER_FILTER',
83 83
         'type' => 'bool',
84 84
         'default' => true,
85 85
         'width' => '10%',
86
-      ),
87
-      'status' => 
88
-      array (
86
+        ),
87
+        'status' => 
88
+        array (
89 89
         'name' => 'status',
90 90
         'default' => true,
91 91
         'width' => '10%',
92
-      ),
93
-      'assigned_user_id' => 
94
-      array (
92
+        ),
93
+        'assigned_user_id' => 
94
+        array (
95 95
         'name' => 'assigned_user_id',
96 96
         'type' => 'enum',
97 97
         'label' => 'LBL_ASSIGNED_TO',
98 98
         'function' => 
99 99
         array (
100
-          'name' => 'get_user_array',
101
-          'params' => 
102
-          array (
100
+            'name' => 'get_user_array',
101
+            'params' => 
102
+            array (
103 103
             0 => false,
104
-          ),
104
+            ),
105 105
         ),
106 106
         'default' => true,
107 107
         'width' => '10%',
108
-      ),
108
+        ),
109 109
       
110 110
     ),
111
-  ),
112
-  'templateMeta' => 
113
-  array (
111
+    ),
112
+    'templateMeta' => 
113
+    array (
114 114
     'maxColumns' => '3',
115 115
     'maxColumnsBasic' => '4', 
116 116
     'widths' => 
117 117
     array (
118
-      'label' => '10',
119
-      'field' => '30',
118
+        'label' => '10',
119
+        'field' => '30',
120
+    ),
120 121
     ),
121
-  ),
122 122
 );
123 123
 ?>
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -38,38 +38,38 @@  discard block
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 $searchdefs ['Meetings'] = 
41
-array (
41
+array(
42 42
   'layout' => 
43
-  array (
43
+  array(
44 44
     'basic_search' => 
45
-    array (
45
+    array(
46 46
       'name' => 
47
-      array (
47
+      array(
48 48
         'name' => 'name',
49 49
         'default' => true,
50 50
         'width' => '10%',
51 51
       ),
52 52
       'current_user_only' => 
53
-      array (
53
+      array(
54 54
         'name' => 'current_user_only',
55 55
         'label' => 'LBL_CURRENT_USER_FILTER',
56 56
         'type' => 'bool',
57 57
         'default' => true,
58 58
         'width' => '10%',
59 59
       ),
60
-      array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
61
-      array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
60
+      array('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
61
+      array('name' => 'favorites_only', 'label' => 'LBL_FAVORITES_FILTER', 'type' => 'bool',),
62 62
     ),
63 63
     'advanced_search' => 
64
-    array (
64
+    array(
65 65
       'name' => 
66
-      array (
66
+      array(
67 67
         'name' => 'name',
68 68
         'default' => true,
69 69
         'width' => '10%',
70 70
       ),
71 71
       'parent_name' => 
72
-      array (
72
+      array(
73 73
         'type' => 'parent',
74 74
         'label' => 'LBL_LIST_RELATED_TO',
75 75
         'width' => '10%',
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         'name' => 'parent_name',
78 78
       ),
79 79
       'current_user_only' => 
80
-      array (
80
+      array(
81 81
         'name' => 'current_user_only',
82 82
         'label' => 'LBL_CURRENT_USER_FILTER',
83 83
         'type' => 'bool',
@@ -85,21 +85,21 @@  discard block
 block discarded – undo
85 85
         'width' => '10%',
86 86
       ),
87 87
       'status' => 
88
-      array (
88
+      array(
89 89
         'name' => 'status',
90 90
         'default' => true,
91 91
         'width' => '10%',
92 92
       ),
93 93
       'assigned_user_id' => 
94
-      array (
94
+      array(
95 95
         'name' => 'assigned_user_id',
96 96
         'type' => 'enum',
97 97
         'label' => 'LBL_ASSIGNED_TO',
98 98
         'function' => 
99
-        array (
99
+        array(
100 100
           'name' => 'get_user_array',
101 101
           'params' => 
102
-          array (
102
+          array(
103 103
             0 => false,
104 104
           ),
105 105
         ),
@@ -110,11 +110,11 @@  discard block
 block discarded – undo
110 110
     ),
111 111
   ),
112 112
   'templateMeta' => 
113
-  array (
113
+  array(
114 114
     'maxColumns' => '3',
115 115
     'maxColumnsBasic' => '4', 
116 116
     'widths' => 
117
-    array (
117
+    array(
118 118
       'label' => '10',
119 119
       'field' => '30',
120 120
     ),
Please login to merge, or discard this patch.
modules/Meetings/metadata/SearchFields.php 3 patches
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -40,21 +40,21 @@  discard block
 block discarded – undo
40 40
 global $current_user;
41 41
 $module_name = "Meetings";
42 42
 $searchFields['Meetings'] = 
43
-	array (
44
-		'name' => array( 'query_type'=>'default'),
43
+    array (
44
+        'name' => array( 'query_type'=>'default'),
45 45
         'contact_name' => array( 'query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name')),        
46 46
         'date_start' => array( 'query_type'=>'default'),
47 47
         'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
48 48
         'assigned_user_id'=> array('query_type'=>'default'),
49 49
         'status'=> array('query_type'=>'default', 'options' => 'meeting_status_dom', 'template_var' => 'STATUS_FILTER'),
50 50
         
51
-		'open_only' => array(
52
-			'query_type'=>'default',
53
-			'db_field'=>array('status'),
54
-			'operator'=>'not in',
55
-			'closed_values' => array('Held', 'Not Held'),
56
-			'type'=>'bool',
57
-		),		
51
+        'open_only' => array(
52
+            'query_type'=>'default',
53
+            'db_field'=>array('status'),
54
+            'operator'=>'not in',
55
+            'closed_values' => array('Held', 'Not Held'),
56
+            'type'=>'bool',
57
+        ),		
58 58
         'favorites_only' => array(
59 59
             'query_type'=>'format',
60 60
             'operator' => 'subquery',
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 			                        and favorites.parent_type = "'.$module_name.'"
64 64
 			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
65 65
             'db_field'=>array('id')),
66
-		//Range Search Support
67
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
68
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
69
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
70
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
71
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
72
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
73
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
74
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
75
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
76
-	   'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
77
-	   'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
78
-       'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
79
-	    //Range Search Support 				
80
-	);
66
+        //Range Search Support
67
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
68
+        'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
69
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
70
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
71
+        'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
72
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
73
+        'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
74
+        'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
75
+        'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
76
+        'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
77
+        'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
78
+        'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
79
+        //Range Search Support 				
80
+    );
81 81
 ?>
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,11 +40,11 @@  discard block
 block discarded – undo
40 40
 global $current_user;
41 41
 $module_name = "Meetings";
42 42
 $searchFields['Meetings'] = 
43
-	array (
44
-		'name' => array( 'query_type'=>'default'),
45
-        'contact_name' => array( 'query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name')),        
46
-        'date_start' => array( 'query_type'=>'default'),
47
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
43
+	array(
44
+		'name' => array('query_type'=>'default'),
45
+        'contact_name' => array('query_type'=>'default', 'db_field'=>array('contacts.first_name', 'contacts.last_name')),        
46
+        'date_start' => array('query_type'=>'default'),
47
+        'current_user_only'=> array('query_type'=>'default', 'db_field'=>array('assigned_user_id'), 'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
48 48
         'assigned_user_id'=> array('query_type'=>'default'),
49 49
         'status'=> array('query_type'=>'default', 'options' => 'meeting_status_dom', 'template_var' => 'STATUS_FILTER'),
50 50
         
@@ -61,21 +61,21 @@  discard block
 block discarded – undo
61 61
             'subquery' => 'SELECT favorites.parent_id FROM favorites
62 62
 			                    WHERE favorites.deleted = 0
63 63
 			                        and favorites.parent_type = "'.$module_name.'"
64
-			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
64
+			                        and favorites.assigned_user_id = "' .$current_user->id.'") OR NOT ({0}',
65 65
             'db_field'=>array('id')),
66 66
 		//Range Search Support
67
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
68
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
69
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
70
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
71
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
72
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
73
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
74
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
75
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
76
-	   'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
77
-	   'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
78
-       'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
67
+	   'range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
68
+	   'start_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
69
+	   'end_range_date_entered' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
70
+	   'range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
71
+	   'start_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
72
+       'end_range_date_modified' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
73
+	   'range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
74
+	   'start_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
75
+	   'end_range_date_start' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
76
+	   'range_date_end' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
77
+	   'start_range_date_end' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
78
+       'end_range_date_end' => array('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
79 79
 	    //Range Search Support 				
80 80
 	);
81 81
 ?>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
Please login to merge, or discard this patch.
modules/Meetings/metadata/detailviewdefs.php 2 patches
Indentation   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -39,56 +39,56 @@  discard block
 block discarded – undo
39 39
 
40 40
 $viewdefs ['Meetings'] = 
41 41
 array (
42
-  'DetailView' => 
43
-  array (
42
+    'DetailView' => 
43
+    array (
44 44
     'templateMeta' => 
45 45
     array (
46 46
         'includes' => array(
47 47
             array('file' => 'modules/Reminders/Reminders.js'),
48 48
         ),
49
-      'form' => 
50
-      array (
49
+        'form' => 
50
+        array (
51 51
         'buttons' => 
52 52
         array (
53
-          0 => 'EDIT',
54
-          1 => 'DUPLICATE',
55
-          2 => 'DELETE',
56
-          3 => 
57
-          array (
53
+            0 => 'EDIT',
54
+            1 => 'DUPLICATE',
55
+            2 => 'DELETE',
56
+            3 => 
57
+            array (
58 58
             '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=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;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}',
59
-              //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
60
-              'sugar_html' => array(
61
-                  'type' => 'submit',
62
-                  'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
63
-                  'htmlOptions' => array(
64
-                      'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
65
-                      'name' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
66
-                      'class' => 'button',
67
-                      'id' => 'close_create_button',
68
-                      'onclick' => 'this.form.isSaveFromDetailView.value=true; this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;this.form.return_id.value=\'{$fields.id.value}\';',
59
+                //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
60
+                'sugar_html' => array(
61
+                    'type' => 'submit',
62
+                    'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
63
+                    'htmlOptions' => array(
64
+                        'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
65
+                        'name' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
66
+                        'class' => 'button',
67
+                        'id' => 'close_create_button',
68
+                        'onclick' => 'this.form.isSaveFromDetailView.value=true; this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;this.form.return_id.value=\'{$fields.id.value}\';',
69 69
 
70
-                  ),
71
-                  'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
72
-              ),
73
-          ),
74
-          4 => 
75
-          array (
70
+                    ),
71
+                    'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
72
+                ),
73
+            ),
74
+            4 => 
75
+            array (
76 76
             '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=\'Meetings\';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}',
77
-              //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
78
-              'sugar_html' => array(
79
-                  'type' => 'submit',
80
-                  'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
81
-                  'htmlOptions' => array(
82
-                      'title' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
83
-                      'accesskey' => '{$APP.LBL_CLOSE_BUTTON_KEY}',
84
-                      'class' => 'button',
85
-                      'onclick' => 'this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';',
86
-                      'name' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
87
-                      'id' => 'close_button',
88
-                  ),
89
-                  'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
90
-              ),
91
-          ),
77
+                //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
78
+                'sugar_html' => array(
79
+                    'type' => 'submit',
80
+                    'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
81
+                    'htmlOptions' => array(
82
+                        'title' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
83
+                        'accesskey' => '{$APP.LBL_CLOSE_BUTTON_KEY}',
84
+                        'class' => 'button',
85
+                        'onclick' => 'this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';',
86
+                        'name' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
87
+                        'id' => 'close_button',
88
+                    ),
89
+                    'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
90
+                ),
91
+            ),
92 92
         ),
93 93
         'hidden' => array(
94 94
             '<input type="hidden" name="isSaveAndNew">',
@@ -97,50 +97,50 @@  discard block
 block discarded – undo
97 97
             '<input type="hidden" name="isSave">',
98 98
         ),
99 99
         'headerTpl' => 'modules/Meetings/tpls/detailHeader.tpl',
100
-      ),
101
-      'maxColumns' => '2',
102
-      'widths' => 
103
-      array (
100
+        ),
101
+        'maxColumns' => '2',
102
+        'widths' => 
103
+        array (
104 104
         0 => 
105 105
         array (
106
-          'label' => '10',
107
-          'field' => '30',
106
+            'label' => '10',
107
+            'field' => '30',
108 108
         ),
109 109
         1 => 
110 110
         array (
111
-          'label' => '10',
112
-          'field' => '30',
111
+            'label' => '10',
112
+            'field' => '30',
113
+        ),
113 114
         ),
114
-      ),
115
-      'useTabs' => false,
115
+        'useTabs' => false,
116 116
     ),
117 117
     'panels' => 
118 118
     array (
119
-      'lbl_meeting_information' => 
120
-      array (
119
+        'lbl_meeting_information' => 
120
+        array (
121 121
         array (
122
-          array (
122
+            array (
123 123
             'name' => 'name',
124 124
             'label' => 'LBL_SUBJECT',
125
-          ),
126
-          'status',
125
+            ),
126
+            'status',
127 127
         ),
128 128
         array (
129
-          array (
129
+            array (
130 130
             'name' => 'date_start',
131 131
             'label' => 'LBL_DATE_TIME',
132
-          ),
132
+            ),
133 133
         ),
134 134
         array (
135
-          array (
135
+            array (
136 136
             'name' => 'duration',
137 137
             'customCode' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
138 138
             'label' => 'LBL_DURATION',
139
-          ),
140
-          array (
139
+            ),
140
+            array (
141 141
             'name' => 'parent_name',
142 142
             'customLabel' => '{sugar_translate label=\'LBL_MODULE_NAME\' module=$fields.parent_type.value}',
143
-          ),
143
+            ),
144 144
         ),
145 145
         array (
146 146
 //          array(
@@ -148,38 +148,38 @@  discard block
 block discarded – undo
148 148
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
149 149
 //            'label' => 'LBL_REMINDER',
150 150
 //            ),
151
-          array(
151
+            array(
152 152
             'name' => 'reminders',
153 153
             'label' => 'LBL_REMINDERS',
154 154
             ),
155
-          'location',
155
+            'location',
156 156
         ),
157 157
         array (
158
-          'description',
158
+            'description',
159
+        ),
159 160
         ),
160
-      ),
161
-      'LBL_PANEL_ASSIGNMENT' => 
162
-      array (
161
+        'LBL_PANEL_ASSIGNMENT' => 
163 162
         array (
164
-          array (
163
+        array (
164
+            array (
165 165
             'name' => 'assigned_user_name',
166 166
             'label' => 'LBL_ASSIGNED_TO',
167
-          ),
168
-          array (
167
+            ),
168
+            array (
169 169
             'name' => 'date_modified',
170 170
             'label' => 'LBL_DATE_MODIFIED',
171 171
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
172
-          ),
172
+            ),
173 173
 
174 174
         ),
175 175
         array (
176
-          array (
176
+            array (
177 177
             'name' => 'date_entered',
178 178
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
179
-          ),
179
+            ),
180 180
         ),
181
-      ),
181
+        ),
182
+    ),
182 183
     ),
183
-  ),
184 184
 );
185 185
 ?>
Please login to merge, or discard this patch.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -38,23 +38,23 @@  discard block
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 $viewdefs ['Meetings'] = 
41
-array (
41
+array(
42 42
   'DetailView' => 
43
-  array (
43
+  array(
44 44
     'templateMeta' => 
45
-    array (
45
+    array(
46 46
         'includes' => array(
47 47
             array('file' => 'modules/Reminders/Reminders.js'),
48 48
         ),
49 49
       'form' => 
50
-      array (
50
+      array(
51 51
         'buttons' => 
52
-        array (
52
+        array(
53 53
           0 => 'EDIT',
54 54
           1 => 'DUPLICATE',
55 55
           2 => 'DELETE',
56 56
           3 => 
57
-          array (
57
+          array(
58 58
             '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=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;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}',
59 59
               //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
60 60
               'sugar_html' => array(
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
               ),
73 73
           ),
74 74
           4 => 
75
-          array (
75
+          array(
76 76
             '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=\'Meetings\';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}',
77 77
               //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
78 78
               'sugar_html' => array(
@@ -100,14 +100,14 @@  discard block
 block discarded – undo
100 100
       ),
101 101
       'maxColumns' => '2',
102 102
       'widths' => 
103
-      array (
103
+      array(
104 104
         0 => 
105
-        array (
105
+        array(
106 106
           'label' => '10',
107 107
           'field' => '30',
108 108
         ),
109 109
         1 => 
110
-        array (
110
+        array(
111 111
           'label' => '10',
112 112
           'field' => '30',
113 113
         ),
@@ -115,34 +115,34 @@  discard block
 block discarded – undo
115 115
       'useTabs' => false,
116 116
     ),
117 117
     'panels' => 
118
-    array (
118
+    array(
119 119
       'lbl_meeting_information' => 
120
-      array (
121
-        array (
122
-          array (
120
+      array(
121
+        array(
122
+          array(
123 123
             'name' => 'name',
124 124
             'label' => 'LBL_SUBJECT',
125 125
           ),
126 126
           'status',
127 127
         ),
128
-        array (
129
-          array (
128
+        array(
129
+          array(
130 130
             'name' => 'date_start',
131 131
             'label' => 'LBL_DATE_TIME',
132 132
           ),
133 133
         ),
134
-        array (
135
-          array (
134
+        array(
135
+          array(
136 136
             'name' => 'duration',
137 137
             'customCode' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
138 138
             'label' => 'LBL_DURATION',
139 139
           ),
140
-          array (
140
+          array(
141 141
             'name' => 'parent_name',
142 142
             'customLabel' => '{sugar_translate label=\'LBL_MODULE_NAME\' module=$fields.parent_type.value}',
143 143
           ),
144 144
         ),
145
-        array (
145
+        array(
146 146
 //          array(
147 147
 //            'name' => 'reminder_time',
148 148
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
@@ -154,26 +154,26 @@  discard block
 block discarded – undo
154 154
             ),
155 155
           'location',
156 156
         ),
157
-        array (
157
+        array(
158 158
           'description',
159 159
         ),
160 160
       ),
161 161
       'LBL_PANEL_ASSIGNMENT' => 
162
-      array (
163
-        array (
164
-          array (
162
+      array(
163
+        array(
164
+          array(
165 165
             'name' => 'assigned_user_name',
166 166
             'label' => 'LBL_ASSIGNED_TO',
167 167
           ),
168
-          array (
168
+          array(
169 169
             'name' => 'date_modified',
170 170
             'label' => 'LBL_DATE_MODIFIED',
171 171
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
172 172
           ),
173 173
 
174 174
         ),
175
-        array (
176
-          array (
175
+        array(
176
+          array(
177 177
             'name' => 'date_entered',
178 178
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
179 179
           ),
Please login to merge, or discard this patch.