Completed
Push — develop ( 695bbe )
by Adam
37:32 queued 21:39
created
modules/EmailTemplates/EditView.php 1 patch
Braces   +42 added lines, -12 removed lines patch added patch discarded remove patch
@@ -68,7 +68,9 @@  discard block
 block discarded – undo
68 68
 
69 69
 
70 70
 //setting default flag value so due date and time not required
71
-if (!isset($focus->id)) $focus->date_due_flag = 1;
71
+if (!isset($focus->id)) {
72
+    $focus->date_due_flag = 1;
73
+}
72 74
 
73 75
 //needed when creating a new case with default values passed in
74 76
 if (isset($_REQUEST['contact_name']) && is_null($focus->contact_name)) {
@@ -130,12 +132,16 @@  discard block
 block discarded – undo
130 132
 $xtpl->parse("main.variable_option");
131 133
 
132 134
 $returnAction = 'index';
133
-if (isset($_REQUEST['return_module'])) $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
135
+if (isset($_REQUEST['return_module'])) {
136
+    $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']);
137
+}
134 138
 if (isset($_REQUEST['return_action'])) {
135 139
     $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']);
136 140
     $returnAction = $_REQUEST['return_action'];
137 141
 }
138
-if (isset($_REQUEST['return_id'])) $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
142
+if (isset($_REQUEST['return_id'])) {
143
+    $xtpl->assign("RETURN_ID", $_REQUEST['return_id']);
144
+}
139 145
 // handle Create $module then Cancel
140 146
 if (empty($_REQUEST['return_id'])) {
141 147
     $xtpl->assign("RETURN_ACTION", 'index');
@@ -164,8 +170,9 @@  discard block
 block discarded – undo
164 170
 );
165 171
 $json = getJSONobj();
166 172
 $xtpl->assign('encoded_assigned_users_popup_request_data', $json->encode($popup_request_data));
167
-if (!empty($focus->assigned_user_name))
173
+if (!empty($focus->assigned_user_name)) {
168 174
     $xtpl->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
175
+}
169 176
 
170 177
 $xtpl->assign("assign_user_select", SugarThemeRegistry::current()->getImage('id-ff-select', '', null, null, '.png', $mod_strings['LBL_SELECT']));
171 178
 $xtpl->assign("assign_user_clear", SugarThemeRegistry::current()->getImage('id-ff-clear', '', null, null, '.gif', $mod_strings['LBL_ID_FF_CLEAR']));
@@ -187,23 +194,38 @@  discard block
 block discarded – undo
187 194
 $xtpl->assign("JSLANG", $jsLang);
188 195
 
189 196
 $xtpl->assign("ID", $focus->id);
190
-if (isset($focus->name)) $xtpl->assign("NAME", $focus->name); else $xtpl->assign("NAME", "");
197
+if (isset($focus->name)) {
198
+    $xtpl->assign("NAME", $focus->name);
199
+} else {
200
+    $xtpl->assign("NAME", "");
201
+}
191 202
 
192 203
 //Bug45632
193 204
 /* BEGIN - SECURITY GROUPS */
194 205
 /**
195 206
  * if(isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id); else $xtpl->assign("ASSIGNED_USER_ID", "");
196 207
  */
197
-if (isset($focus->assigned_user_id)) $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
198
-else if (empty($focus->id) && empty($focus->assigned_user_id)) {
208
+if (isset($focus->assigned_user_id)) {
209
+    $xtpl->assign("ASSIGNED_USER_ID", $focus->assigned_user_id);
210
+} else if (empty($focus->id) && empty($focus->assigned_user_id)) {
199 211
     $xtpl->assign("ASSIGNED_USER_ID", $current_user->id);
200 212
     $xtpl->assign("ASSIGNED_USER_NAME", get_assigned_user_name($current_user->id));
201
-} else $xtpl->assign("ASSIGNED_USER_ID", "");
213
+} else {
214
+    $xtpl->assign("ASSIGNED_USER_ID", "");
215
+}
202 216
 /* END - SECURITY GROUPS */
203 217
 //Bug45632
204 218
 
205
-if (isset($focus->description)) $xtpl->assign("DESCRIPTION", $focus->description); else $xtpl->assign("DESCRIPTION", "");
206
-if (isset($focus->subject)) $xtpl->assign("SUBJECT", $focus->subject); else $xtpl->assign("SUBJECT", "");
219
+if (isset($focus->description)) {
220
+    $xtpl->assign("DESCRIPTION", $focus->description);
221
+} else {
222
+    $xtpl->assign("DESCRIPTION", "");
223
+}
224
+if (isset($focus->subject)) {
225
+    $xtpl->assign("SUBJECT", $focus->subject);
226
+} else {
227
+    $xtpl->assign("SUBJECT", "");
228
+}
207 229
 if ($focus->published == 'on') {
208 230
     $xtpl->assign("PUBLISHED", "CHECKED");
209 231
 }
@@ -244,8 +266,16 @@  discard block
 block discarded – undo
244 266
 $xtpl->assign("TYPE_OPTIONS", get_select_options_with_id($app_list_strings['record_type_display'], $focus->parent_type));
245 267
 //$xtpl->assign("DEFAULT_MODULE","Accounts");
246 268
 
247
-if (isset($focus->body)) $xtpl->assign("BODY", $focus->body); else $xtpl->assign("BODY", "");
248
-if (isset($focus->body_html)) $xtpl->assign("BODY_HTML", $focus->body_html); else $xtpl->assign("BODY_HTML", "");
269
+if (isset($focus->body)) {
270
+    $xtpl->assign("BODY", $focus->body);
271
+} else {
272
+    $xtpl->assign("BODY", "");
273
+}
274
+if (isset($focus->body_html)) {
275
+    $xtpl->assign("BODY_HTML", $focus->body_html);
276
+} else {
277
+    $xtpl->assign("BODY_HTML", "");
278
+}
249 279
 
250 280
 
251 281
 // ---------------------------------
Please login to merge, or discard this patch.
modules/AOR_Conditions/conditionLines.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,8 +70,7 @@
 block discarded – undo
70 70
             $html .= "</script>";
71 71
         }
72 72
 
73
-    }
74
-    else if($view == 'DetailView'){
73
+    } else if($view == 'DetailView'){
75 74
         $html .= '<script src="modules/AOR_Conditions/conditionLines.js"></script>';
76 75
         $html .= "<table border='0' cellspacing='0' width='100%' id='aor_conditionLines'></table>";
77 76
 
Please login to merge, or discard this patch.