Completed
Push — develop ( 7c1bda...edae1e )
by Adam
18:38 queued 03:14
created
modules/EmailTemplates/field_arrays.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -46,19 +46,19 @@
 block discarded – undo
46 46
  * Contributor(s): ______________________________________..
47 47
  ********************************************************************************/
48 48
 $fields_array['EmailTemplate'] = array ('column_fields' => Array("id"
49
-		, "date_entered"
50
-		, "date_modified"
51
-		, "modified_user_id"
52
-		, "created_by"
53
-		, "description"
54
-		, "subject"
55
-		, "body"
56
-		, "body_html"
57
-		, "name"
58
-		, "published"
59
-		),
49
+        , "date_entered"
50
+        , "date_modified"
51
+        , "modified_user_id"
52
+        , "created_by"
53
+        , "description"
54
+        , "subject"
55
+        , "body"
56
+        , "body_html"
57
+        , "name"
58
+        , "published"
59
+        ),
60 60
         'list_fields' =>  Array('id', 'name', 'description','date_modified'
61
-	),
61
+    ),
62 62
     'required_fields' => array("name"=>1),
63 63
 );
64 64
 ?>
65 65
\ No newline at end of file
Please login to merge, or discard this patch.
modules/EmailTemplates/AttachFiles.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -38,10 +38,10 @@  discard block
 block discarded – undo
38 38
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
39 39
  ********************************************************************************/
40 40
 
41
- //Request object must have these property values:
42
- //		Module: module name, this module should have a file called TreeData.php
43
- //		Function: name of the function to be called in TreeData.php, the function will be called statically.
44
- //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
41
+    //Request object must have these property values:
42
+    //		Module: module name, this module should have a file called TreeData.php
43
+    //		Function: name of the function to be called in TreeData.php, the function will be called statically.
44
+    //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
45 45
 
46 46
 
47 47
 require_once('include/JSON.php');
@@ -56,27 +56,27 @@  discard block
 block discarded – undo
56 56
 $ret = array();
57 57
 
58 58
 foreach($_FILES as $k => $file) {
59
-	if(in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
60
-	    $upload_file = new UploadFile($k);
61
-		// check the file
62
-		if($upload_file->confirm_upload()) {
63
-		    $dest = $cachedir.basename($upload_file->get_stored_file_name()); // target name
64
-		    $guid = create_guid();
65
-		    if($upload_file->final_move($guid)) { // move to uploads
66
-		        $path = $upload_file->get_upload_path($guid);
67
-		        // if file is OK, copy to cache
68
-		        if(verify_uploaded_image($path) && copy($path, $dest)) {
69
-		            $ret[] = $dest;
70
-		        }
71
-		        // remove temp file
72
-		        unlink($path);
73
-		    }
74
-		}
75
-	}
59
+    if(in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
60
+        $upload_file = new UploadFile($k);
61
+        // check the file
62
+        if($upload_file->confirm_upload()) {
63
+            $dest = $cachedir.basename($upload_file->get_stored_file_name()); // target name
64
+            $guid = create_guid();
65
+            if($upload_file->final_move($guid)) { // move to uploads
66
+                $path = $upload_file->get_upload_path($guid);
67
+                // if file is OK, copy to cache
68
+                if(verify_uploaded_image($path) && copy($path, $dest)) {
69
+                    $ret[] = $dest;
70
+                }
71
+                // remove temp file
72
+                unlink($path);
73
+            }
74
+        }
75
+    }
76 76
 }
77 77
 
78 78
 if (!empty($ret)) {
79
-	$json = getJSONobj();
80
-	echo $json->encode($ret);
81
-	//return the parameters
79
+    $json = getJSONobj();
80
+    echo $json->encode($ret);
81
+    //return the parameters
82 82
 }
Please login to merge, or discard this patch.
modules/EmailTemplates/CheckDeletable.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -50,38 +50,38 @@
 block discarded – undo
50 50
 
51 51
 $focus = new EmailTemplate();
52 52
 if($_REQUEST['from'] == 'DetailView') {
53
-	if(!isset($_REQUEST['record']))
54
-		sugar_die("A record number must be specified to delete the template.");
55
-	$focus->retrieve($_REQUEST['record']);
56
-	if(check_email_template_in_use($focus)) {
57
-		echo 'true';
58
-		return;
59
-	}
60
-	echo 'false';
53
+    if(!isset($_REQUEST['record']))
54
+        sugar_die("A record number must be specified to delete the template.");
55
+    $focus->retrieve($_REQUEST['record']);
56
+    if(check_email_template_in_use($focus)) {
57
+        echo 'true';
58
+        return;
59
+    }
60
+    echo 'false';
61 61
 } else if($_REQUEST['from'] == 'ListView') {
62
-	$returnString = '';
63
-	$idArray = explode(',', $_REQUEST['records']);
64
-	foreach($idArray as $key => $value) {
65
-		if($focus->retrieve($value)) {
66
-			if(check_email_template_in_use($focus)) {
67
-				$returnString .= $focus->name . ',';
68
-			}
69
-		}
70
-	}
71
-	$returnString = substr($returnString, 0, -1);
72
-	echo $returnString;
62
+    $returnString = '';
63
+    $idArray = explode(',', $_REQUEST['records']);
64
+    foreach($idArray as $key => $value) {
65
+        if($focus->retrieve($value)) {
66
+            if(check_email_template_in_use($focus)) {
67
+                $returnString .= $focus->name . ',';
68
+            }
69
+        }
70
+    }
71
+    $returnString = substr($returnString, 0, -1);
72
+    echo $returnString;
73 73
 } else {
74
-	echo '';
74
+    echo '';
75 75
 }
76 76
 
77 77
 function check_email_template_in_use($focus)
78 78
 {
79
-	if($focus->is_used_by_email_marketing()) {
80
-		return true;
81
-	}
82
-	$system = $GLOBALS['sugar_config']['passwordsetting'];
83
-	if($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
84
-	    return true;
85
-	}
79
+    if($focus->is_used_by_email_marketing()) {
80
+        return true;
81
+    }
82
+    $system = $GLOBALS['sugar_config']['passwordsetting'];
83
+    if($focus->id == $system['generatepasswordtmpl'] || $focus->id == $system['lostpasswordtmpl']) {
84
+        return true;
85
+    }
86 86
     return false;
87 87
 }
Please login to merge, or discard this patch.
modules/FP_events/responseEntryPoint.php 1 patch
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -1,29 +1,29 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 
4
-	global $db;
4
+    global $db;
5 5
 	 
6
-	$even_id = $_GET['event'];
7
-	$delegate_id = $_GET['delegate'];
8
-	$type = $_GET['type'];
9
-	$response = $_GET['response'];	
6
+    $even_id = $_GET['event'];
7
+    $delegate_id = $_GET['delegate'];
8
+    $type = $_GET['type'];
9
+    $response = $_GET['response'];	
10 10
 
11
-	//get event
11
+    //get event
12 12
     $event = new FP_events();
13 13
     $event->retrieve($even_id);
14 14
     
15 15
     if($type == 'c'){
16 16
     	
17
-    	$event->load_relationship('fp_events_contacts'); // get related contacts
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
-             $check = $db->getOne($check_q);
24
-    		//update contact to accepted
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'){
23
+                $check = $db->getOne($check_q);
24
+            //update contact to accepted
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'){
27 27
     			
28 28
                 if(!IsNullOrEmptyString($event->accept_redirect)){
29 29
                     
@@ -33,17 +33,17 @@  discard block
 block discarded – undo
33 33
                 else{
34 34
                     echo 'Thank you for accepting';
35 35
                 }   
36
-    		}
37
-    		else {
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
-    		}	
40
-    	}
41
-    	else if($response == 'decline'){
42
-    		//check to see if they have already responded to the email
36
+            }
37
+            else {
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
+            }	
40
+        }
41
+        else if($response == 'decline'){
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
-             $check = $db->getOne($check_q);
44
+                $check = $db->getOne($check_q);
45 45
             //update contact to accepted
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"';
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 48
             if($db->query($query) && $check != '1'){
49 49
     			
@@ -56,24 +56,24 @@  discard block
 block discarded – undo
56 56
                 else{
57 57
                     echo 'Thank you for declining';
58 58
                 }
59
-    		}
60
-    		else {
61
-    			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.';
62
-    		}
63
-    	}
59
+            }
60
+            else {
61
+                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.';
62
+            }
63
+        }
64 64
     }
65 65
     if($type == 't'){
66 66
     	
67
-    	$event->load_relationship('fp_events_prospects_1'); //get related targets
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
-             $check = $db->getOne($check_q);
72
+                $check = $db->getOne($check_q);
73 73
 
74
-    		//update contact to accepted
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'){
74
+            //update contact to accepted
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'){
77 77
                 
78 78
                 if(!IsNullOrEmptyString($event->accept_redirect)){
79 79
                     
@@ -87,14 +87,14 @@  discard block
 block discarded – undo
87 87
             else {
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
-    	}
91
-    	else if($response == 'decline'){
90
+        }
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
-             $check = $db->getOne($check_q);
95
-    		//update contact to accepted
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'){
94
+                $check = $db->getOne($check_q);
95
+            //update contact to accepted
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'){
98 98
                 
99 99
                 if(!IsNullOrEmptyString($event->decline_redirect)){
100 100
 
@@ -109,19 +109,19 @@  discard block
 block discarded – undo
109 109
             else {
110 110
                 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.';
111 111
             }
112
-    	}
112
+        }
113 113
     }
114 114
     if($type == 'l'){
115 115
     	
116
-    	$event->load_relationship('fp_events_leads_1'); //get related leads
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
-             $check = $db->getOne($check_q);
122
-    		//update contact to accepted
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'){
121
+                $check = $db->getOne($check_q);
122
+            //update contact to accepted
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'){
125 125
                 
126 126
                 if(!IsNullOrEmptyString($event->accept_redirect)){
127 127
                     
@@ -135,15 +135,15 @@  discard block
 block discarded – undo
135 135
             else {
136 136
                 echo 'There was a problem with the link please contact the sender of the invite';
137 137
             }   
138
-    	}
139
-    	else if($response == 'decline'){
140
-    		//check to see if they have already responded to the email
138
+        }
139
+        else if($response == 'decline'){
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
-             $check = $db->getOne($check_q);
142
+                $check = $db->getOne($check_q);
143 143
             //update contact to accepted
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"';
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 148
                 if(!IsNullOrEmptyString($event->decline_redirect)){
149 149
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
             else {
159 159
                 echo 'There was a problem with the link please contact the sender of the invite';
160 160
             }
161
-    	}
161
+        }
162 162
     }
163 163
     // Function for basic field validation (present and neither empty nor only white space nor just 'http://')
164 164
     function IsNullOrEmptyString($question){
Please login to merge, or discard this patch.
modules/Meetings/JoinExternalMeeting.php 1 patch
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.
modules/Meetings/MeetingsQuickCreate.php 1 patch
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.
modules/Meetings/SubPanelViewInvitees.php 1 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.
modules/Meetings/metadata/editviewdefs.php 1 patch
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.
modules/Meetings/metadata/searchdefs.php 1 patch
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.