Completed
Push — console-installer ( 3d54e5...e2b50d )
by Adam
69:10 queued 48:24
created
modules/Calendar/processScreenSize.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
  */
8 8
 
9 9
 
10
-if(
10
+if (
11 11
     (isset($_SESSION['screen_height']) ? $_SESSION['screen_height'] : null) != (isset($_POST['height']) ? $_POST['height'] : null) ||
12 12
     (isset($_SESSION['screen_width']) ? $_SESSION['screen_width'] : null) != (isset($_POST['width']) ? $_POST['width'] : null)) {
13 13
     $_SESSION['screen_height'] = $_POST['height'];
Please login to merge, or discard this patch.
modules/FP_events/responseEntryPoint.php 1 patch
Spacing   +36 added lines, -36 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
 	global $db;
5 5
 	 
@@ -12,25 +12,25 @@  discard block
 block discarded – undo
12 12
     $event = new FP_events();
13 13
     $event->retrieve($even_id);
14 14
     
15
-    if($type == 'c'){
15
+    if ($type == 'c') {
16 16
     	
17 17
     	$event->load_relationship('fp_events_contacts'); // get related contacts
18 18
 
19
-    	if($response == 'accept'){
19
+    	if ($response == 'accept') {
20 20
 
21 21
             //check to see if they have already responded to the email
22 22
             $check_q = 'SELECT email_responded FROM fp_events_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
23 23
              $check = $db->getOne($check_q);
24 24
     		//update contact to accepted
25 25
     		$query = 'UPDATE fp_events_contacts_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
26
-    		if($db->query($query) && $check != '1'){
26
+    		if ($db->query($query) && $check != '1') {
27 27
     			
28
-                if(!IsNullOrEmptyString($event->accept_redirect)){
28
+                if (!IsNullOrEmptyString($event->accept_redirect)) {
29 29
                     
30 30
                     $url = $event->accept_redirect;
31
-                    header('Location: ' . $url);    
31
+                    header('Location: '.$url);    
32 32
                 }
33
-                else{
33
+                else {
34 34
                     echo 'Thank you for accepting';
35 35
                 }   
36 36
     		}
@@ -38,22 +38,22 @@  discard block
 block discarded – undo
38 38
     			echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
39 39
     		}	
40 40
     	}
41
-    	else if($response == 'decline'){
41
+    	else if ($response == 'decline') {
42 42
     		//check to see if they have already responded to the email
43 43
             $check_q = 'SELECT email_responded FROM fp_events_contacts_c WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'"';
44 44
              $check = $db->getOne($check_q);
45 45
             //update contact to accepted
46 46
     		$query = 'UPDATE fp_events_contacts_c SET accept_status="Declined", email_responded="1" WHERE fp_events_contactsfp_events_ida="'.$event->id.'" AND fp_events_contactscontacts_idb="'.$delegate_id.'" AND email_responded="0"';
47 47
     		
48
-            if($db->query($query) && $check != '1'){
48
+            if ($db->query($query) && $check != '1') {
49 49
     			
50
-                if(!IsNullOrEmptyString($event->decline_redirect)){
50
+                if (!IsNullOrEmptyString($event->decline_redirect)) {
51 51
 
52 52
                     $url = $event->decline_redirect;
53
-                    header('Location: ' . $url);    
53
+                    header('Location: '.$url);    
54 54
                     
55 55
                 }
56
-                else{
56
+                else {
57 57
                     echo 'Thank you for declining';
58 58
                 }
59 59
     		}
@@ -62,25 +62,25 @@  discard block
 block discarded – undo
62 62
     		}
63 63
     	}
64 64
     }
65
-    if($type == 't'){
65
+    if ($type == 't') {
66 66
     	
67 67
     	$event->load_relationship('fp_events_prospects_1'); //get related targets
68 68
 
69
-    	if($response == 'accept'){
69
+    	if ($response == 'accept') {
70 70
             //check to see if they have already responded to the email
71 71
             $check_q = 'SELECT email_responded FROM fp_events_prospects_1_c WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'"';
72 72
              $check = $db->getOne($check_q);
73 73
 
74 74
     		//update contact to accepted
75 75
     		$query = 'UPDATE fp_events_prospects_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
76
-    		if($db->query($query) && $check != '1'){
76
+    		if ($db->query($query) && $check != '1') {
77 77
                 
78
-                if(!IsNullOrEmptyString($event->accept_redirect)){
78
+                if (!IsNullOrEmptyString($event->accept_redirect)) {
79 79
                     
80 80
                     $url = $event->accept_redirect;
81
-                    header('Location: ' . $url);    
81
+                    header('Location: '.$url);    
82 82
                 }
83
-                else{
83
+                else {
84 84
                     echo 'Thank you for accepting';
85 85
                 }   
86 86
             }
@@ -88,21 +88,21 @@  discard block
 block discarded – undo
88 88
                 echo 'You have already responded to the invitation or there was a problem with the link. Please contact the sender of the invite for help.';
89 89
             }   
90 90
     	}
91
-    	else if($response == 'decline'){
91
+    	else if ($response == 'decline') {
92 92
             //check to see if they have already responded to the email
93 93
             $check_q = 'SELECT email_responded FROM fp_events_prospects_1_c WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'"';
94 94
              $check = $db->getOne($check_q);
95 95
     		//update contact to accepted
96 96
     		$query = 'UPDATE fp_events_prospects_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_prospects_1fp_events_ida="'.$event->id.'" AND fp_events_prospects_1prospects_idb="'.$delegate_id.'" AND email_responded="0"';
97
-    		if($db->query($query) && $check != '1'){
97
+    		if ($db->query($query) && $check != '1') {
98 98
                 
99
-                if(!IsNullOrEmptyString($event->decline_redirect)){
99
+                if (!IsNullOrEmptyString($event->decline_redirect)) {
100 100
 
101 101
                     $url = $event->decline_redirect;
102
-                    header('Location: ' . $url);    
102
+                    header('Location: '.$url);    
103 103
                     
104 104
                 }
105
-                else{
105
+                else {
106 106
                     echo 'Thank you for declining';
107 107
                 }
108 108
             }
@@ -111,24 +111,24 @@  discard block
 block discarded – undo
111 111
             }
112 112
     	}
113 113
     }
114
-    if($type == 'l'){
114
+    if ($type == 'l') {
115 115
     	
116 116
     	$event->load_relationship('fp_events_leads_1'); //get related leads
117 117
 
118
-    	if($response == 'accept'){
118
+    	if ($response == 'accept') {
119 119
             //check to see if they have already responded to the email
120 120
             $check_q = 'SELECT email_responded FROM fp_events_leads_1_c WHERE ffp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'"';
121 121
              $check = $db->getOne($check_q);
122 122
     		//update contact to accepted
123 123
     		$query = 'UPDATE fp_events_leads_1_c SET accept_status="Accepted", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
124
-    		if($db->query($query) && $check != '1'){
124
+    		if ($db->query($query) && $check != '1') {
125 125
                 
126
-                if(!IsNullOrEmptyString($event->accept_redirect)){
126
+                if (!IsNullOrEmptyString($event->accept_redirect)) {
127 127
                     
128 128
                     $url = $event->accept_redirect;
129
-                    header('Location: ' . $url);    
129
+                    header('Location: '.$url);    
130 130
                 }
131
-                else{
131
+                else {
132 132
                     echo 'Thank you for accepting';
133 133
                 }   
134 134
             }
@@ -136,22 +136,22 @@  discard block
 block discarded – undo
136 136
                 echo 'There was a problem with the link please contact the sender of the invite';
137 137
             }   
138 138
     	}
139
-    	else if($response == 'decline'){
139
+    	else if ($response == 'decline') {
140 140
     		//check to see if they have already responded to the email
141 141
             $check_q = 'SELECT email_responded FROM fp_events_leads_1_c WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'"';
142 142
              $check = $db->getOne($check_q);
143 143
             //update contact to accepted
144 144
     		$query = 'UPDATE fp_events_leads_1_c SET accept_status="Declined", email_responded="1" WHERE fp_events_leads_1fp_events_ida="'.$event->id.'" AND fp_events_leads_1leads_idb="'.$delegate_id.'" AND email_responded="0"';
145 145
 
146
-    		if($db->query($query) && $check != '1'){
146
+    		if ($db->query($query) && $check != '1') {
147 147
                 
148
-                if(!IsNullOrEmptyString($event->decline_redirect)){
148
+                if (!IsNullOrEmptyString($event->decline_redirect)) {
149 149
 
150 150
                     $url = $event->decline_redirect;
151
-                    header('Location: ' . $url);    
151
+                    header('Location: '.$url);    
152 152
                     
153 153
                 }
154
-                else{
154
+                else {
155 155
                     echo 'Thank you for declining';
156 156
                 }
157 157
             }
@@ -161,8 +161,8 @@  discard block
 block discarded – undo
161 161
     	}
162 162
     }
163 163
     // Function for basic field validation (present and neither empty nor only white space nor just 'http://')
164
-    function IsNullOrEmptyString($question){
165
-        return (!isset($question) || trim($question)==='' || $question =='http://');
164
+    function IsNullOrEmptyString($question) {
165
+        return (!isset($question) || trim($question) === '' || $question == 'http://');
166 166
     }
167 167
 
168 168
 ?>
Please login to merge, or discard this patch.
modules/Meetings/JoinExternalMeeting.php 1 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.
modules/Meetings/MeetingsQuickCreate.php 1 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.
modules/Meetings/SubPanelViewInvitees.php 1 patch
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.
modules/Meetings/metadata/additionalDetails.php 1 patch
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.
modules/Meetings/metadata/editviewdefs.php 1 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 1 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 1 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.