Skip to content

Commit 4588a33

Browse files
committed
Fix warnings
1 parent 68e6061 commit 4588a33

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

htdocs/cabinetmed/canvas/patient/tpl/card_create.tpl.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
<input type="hidden" name="private" value="0">
228228
<input type="hidden" name="status" value="1">
229229
<input type="hidden" name="client" value="<?php echo $object->client; ?>">
230-
<?php
230+
<?php
231231
if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) {
232232
print '<input type="hidden" name="code_auto" value="1">';
233233
}
@@ -283,7 +283,7 @@
283283
*/
284284
print '<td colspan="2"></td>';
285285
print '</tr>';
286-
286+
287287
// Barcode
288288
if (isModEnabled('barcode')) {
289289
print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
@@ -292,9 +292,9 @@
292292
print '<input type="text" class="minwidth200 maxwidth300 widthcentpercentminusx" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
293293
print '</td></tr>';
294294
}
295-
295+
296296
print '<tr><td colspan="4">&nbsp;</td></tr>';
297-
297+
298298
// Address
299299
print '<tr><td class="tdtop">';
300300
print $form->editfieldkey('Address', 'address', '', $object, 0);
@@ -305,7 +305,7 @@
305305
print '</textarea>';
306306
print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
307307
print '</td></tr>';
308-
308+
309309
// Zip / Town
310310
print '<tr><td>'.$langs->trans('Zip').'</td><td>';
311311
print $formcompany->select_ziptown($object->zip, 'zipcode', array('town','selectcountry_id','departement_id'), 0, 0, '', 'maxwidth100');
@@ -329,7 +329,7 @@
329329
// State
330330
if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
331331
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3" class="maxwidthonsmartphone">';
332-
332+
333333
if ($object->country_id) {
334334
print img_picto('', 'state', 'class="pictofixedwidth"');
335335
print $formcompany->select_state($object->state_id, $object->country_code, 'state_id', 'minwidth200 maxwidth300 widthcentpercentminusx');
@@ -338,15 +338,15 @@
338338
}
339339
print '</td></tr>';
340340
}
341-
341+
342342
// Phone / Fax
343343
print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
344344
print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
345345

346346
if ($conf->browser->layout == 'phone') {
347347
print '</tr><tr>';
348-
}
349-
348+
}
349+
350350
// Phone mobile
351351
print '<td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', '', $object, 0).'</td>';
352352
print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"').' <input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td></tr>';
@@ -444,9 +444,9 @@
444444
print '</td>';
445445
print '</tr>';
446446

447-
if ($conf->global->MAIN_MULTILANGS) {
447+
if (getDolGlobalInt('MAIN_MULTILANGS')) {
448448
print '<tr><td>'.$langs->trans("DefaultLang").'</td><td colspan="3">'."\n";
449-
print $formadmin->select_language(($object->default_lang?$object->default_lang:$conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1);
449+
print $formadmin->select_language(($object->default_lang ? $object->default_lang : getDolGlobalString('MAIN_LANG_DEFAULT')), 'default_lang', 0, 0, 1);
450450
print '</td>';
451451
print '</tr>';
452452
}

htdocs/cabinetmed/canvas/patient/tpl/card_view.tpl.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,10 +456,10 @@
456456
// Define output language
457457
$outputlangs = $langs;
458458
$newlang = '';
459-
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
459+
if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
460460
$newlang = GETPOST('lang_id', 'aZ09');
461461
}
462-
if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
462+
if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
463463
$newlang = $object->client->default_lang;
464464
}
465465

htdocs/cabinetmed/documents.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,12 @@
138138
// Define output language
139139
$outputlangs = $langs;
140140
$newlang='';
141-
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
142-
//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$fac->client->default_lang;
141+
if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id','aZ09')) {
142+
$newlang = GETPOST('lang_id','aZ09');
143+
}
143144
if (! empty($newlang))
144145
{
145-
$outputlangs = new Translate("",$conf);
146+
$outputlangs = new Translate("", $conf);
146147
$outputlangs->setDefaultLang($newlang);
147148
}
148149

0 commit comments

Comments
 (0)