@@ -215,32 +215,32 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | $object->entity = (GETPOSTISSET('entity') ? GETPOSTINT('entity') : $conf->entity); |
| 217 | 217 | $object->socid = $socid; |
| 218 | - $object->lastname = (string)GETPOST("lastname", 'alpha'); |
|
| 219 | - $object->firstname = (string)GETPOST("firstname", 'alpha'); |
|
| 220 | - $object->civility_code = (string)GETPOST("civility_code", 'alpha'); |
|
| 221 | - $object->poste = (string)GETPOST("poste", 'alpha'); |
|
| 222 | - $object->address = (string)GETPOST("address", 'alpha'); |
|
| 223 | - $object->zip = (string)GETPOST("zipcode", 'alpha'); |
|
| 224 | - $object->town = (string)GETPOST("town", 'alpha'); |
|
| 218 | + $object->lastname = (string) GETPOST("lastname", 'alpha'); |
|
| 219 | + $object->firstname = (string) GETPOST("firstname", 'alpha'); |
|
| 220 | + $object->civility_code = (string) GETPOST("civility_code", 'alpha'); |
|
| 221 | + $object->poste = (string) GETPOST("poste", 'alpha'); |
|
| 222 | + $object->address = (string) GETPOST("address", 'alpha'); |
|
| 223 | + $object->zip = (string) GETPOST("zipcode", 'alpha'); |
|
| 224 | + $object->town = (string) GETPOST("town", 'alpha'); |
|
| 225 | 225 | $object->country_id = GETPOSTINT("country_id"); |
| 226 | 226 | $object->state_id = GETPOSTINT("state_id"); |
| 227 | 227 | $object->socialnetworks = array(); |
| 228 | 228 | if (isModEnabled('socialnetworks')) { |
| 229 | 229 | foreach ($socialnetworks as $key => $value) { |
| 230 | 230 | if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') { |
| 231 | - $object->socialnetworks[$key] = (string)GETPOST($key, 'alphanohtml'); |
|
| 231 | + $object->socialnetworks[$key] = (string) GETPOST($key, 'alphanohtml'); |
|
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | } |
| 235 | - $object->email = (string)GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL); |
|
| 235 | + $object->email = (string) GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL); |
|
| 236 | 236 | $object->no_email = GETPOSTINT("no_email"); |
| 237 | - $object->phone_pro = (string)GETPOST("phone_pro", 'alpha'); |
|
| 238 | - $object->phone_perso = (string)GETPOST("phone_perso", 'alpha'); |
|
| 239 | - $object->phone_mobile = (string)GETPOST("phone_mobile", 'alpha'); |
|
| 240 | - $object->fax = (string)GETPOST("fax", 'alpha'); |
|
| 237 | + $object->phone_pro = (string) GETPOST("phone_pro", 'alpha'); |
|
| 238 | + $object->phone_perso = (string) GETPOST("phone_perso", 'alpha'); |
|
| 239 | + $object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha'); |
|
| 240 | + $object->fax = (string) GETPOST("fax", 'alpha'); |
|
| 241 | 241 | $object->priv = GETPOSTINT("priv"); |
| 242 | - $object->note_public = (string)GETPOST("note_public", 'restricthtml'); |
|
| 243 | - $object->note_private = (string)GETPOST("note_private", 'restricthtml'); |
|
| 242 | + $object->note_public = (string) GETPOST("note_public", 'restricthtml'); |
|
| 243 | + $object->note_private = (string) GETPOST("note_private", 'restricthtml'); |
|
| 244 | 244 | $object->roles = GETPOST("roles", 'array'); |
| 245 | 245 | |
| 246 | 246 | $object->statut = 1; //Default status to Actif |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | if (empty($error) && $id > 0) { |
| 314 | 314 | $db->commit(); |
| 315 | 315 | if (!empty($backtopage)) { |
| 316 | - $url = str_replace('__ID__', (string)$id, $backtopage); |
|
| 316 | + $url = str_replace('__ID__', (string) $id, $backtopage); |
|
| 317 | 317 | } else { |
| 318 | 318 | $url = 'card.php?id=' . $id; |
| 319 | 319 | } |
@@ -413,34 +413,34 @@ discard block |
||
| 413 | 413 | $object->oldcopy = clone $object; |
| 414 | 414 | |
| 415 | 415 | $object->socid = $socid; |
| 416 | - $object->lastname = (string)GETPOST("lastname", 'alpha'); |
|
| 417 | - $object->firstname = (string)GETPOST("firstname", 'alpha'); |
|
| 418 | - $object->civility_code = (string)GETPOST("civility_code", 'alpha'); |
|
| 419 | - $object->poste = (string)GETPOST("poste", 'alpha'); |
|
| 420 | - |
|
| 421 | - $object->address = (string)GETPOST("address", 'alpha'); |
|
| 422 | - $object->zip = (string)GETPOST("zipcode", 'alpha'); |
|
| 423 | - $object->town = (string)GETPOST("town", 'alpha'); |
|
| 416 | + $object->lastname = (string) GETPOST("lastname", 'alpha'); |
|
| 417 | + $object->firstname = (string) GETPOST("firstname", 'alpha'); |
|
| 418 | + $object->civility_code = (string) GETPOST("civility_code", 'alpha'); |
|
| 419 | + $object->poste = (string) GETPOST("poste", 'alpha'); |
|
| 420 | + |
|
| 421 | + $object->address = (string) GETPOST("address", 'alpha'); |
|
| 422 | + $object->zip = (string) GETPOST("zipcode", 'alpha'); |
|
| 423 | + $object->town = (string) GETPOST("town", 'alpha'); |
|
| 424 | 424 | $object->state_id = GETPOSTINT("state_id"); |
| 425 | 425 | $object->country_id = GETPOSTINT("country_id"); |
| 426 | 426 | |
| 427 | - $object->email = (string)GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL); |
|
| 427 | + $object->email = (string) GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL); |
|
| 428 | 428 | $object->no_email = GETPOSTINT("no_email"); |
| 429 | 429 | $object->socialnetworks = array(); |
| 430 | 430 | if (isModEnabled('socialnetworks')) { |
| 431 | 431 | foreach ($socialnetworks as $key => $value) { |
| 432 | 432 | if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') { |
| 433 | - $object->socialnetworks[$key] = (string)GETPOST($key, 'alphanohtml'); |
|
| 433 | + $object->socialnetworks[$key] = (string) GETPOST($key, 'alphanohtml'); |
|
| 434 | 434 | } |
| 435 | 435 | } |
| 436 | 436 | } |
| 437 | - $object->phone_pro = (string)GETPOST("phone_pro", 'alpha'); |
|
| 438 | - $object->phone_perso = (string)GETPOST("phone_perso", 'alpha'); |
|
| 439 | - $object->phone_mobile = (string)GETPOST("phone_mobile", 'alpha'); |
|
| 440 | - $object->fax = (string)GETPOST("fax", 'alpha'); |
|
| 441 | - $object->priv = (string)GETPOSTINT("priv"); |
|
| 442 | - $object->note_public = (string)GETPOST("note_public", 'restricthtml'); |
|
| 443 | - $object->note_private = (string)GETPOST("note_private", 'restricthtml'); |
|
| 437 | + $object->phone_pro = (string) GETPOST("phone_pro", 'alpha'); |
|
| 438 | + $object->phone_perso = (string) GETPOST("phone_perso", 'alpha'); |
|
| 439 | + $object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha'); |
|
| 440 | + $object->fax = (string) GETPOST("fax", 'alpha'); |
|
| 441 | + $object->priv = (string) GETPOSTINT("priv"); |
|
| 442 | + $object->note_public = (string) GETPOST("note_public", 'restricthtml'); |
|
| 443 | + $object->note_private = (string) GETPOST("note_private", 'restricthtml'); |
|
| 444 | 444 | |
| 445 | 445 | $object->roles = GETPOST("roles", 'array'); // Note GETPOSTISSET("role") is null when combo is empty |
| 446 | 446 | |
@@ -1262,7 +1262,7 @@ discard block |
||
| 1262 | 1262 | $maxfilesizearray = getMaxFileSizeArray(); |
| 1263 | 1263 | $maxmin = $maxfilesizearray['maxmin']; |
| 1264 | 1264 | if ($maxmin > 0) { |
| 1265 | - print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 1265 | + print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
| 1266 | 1266 | } |
| 1267 | 1267 | print '<input type="file" class="flat maxwidth200" name="photo" id="photoinput">'; |
| 1268 | 1268 | print '</td></tr>'; |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | // Parameters |
| 53 | 53 | $action = GETPOST('action', 'aZ09'); |
| 54 | 54 | $backtopage = GETPOST('backtopage', 'alpha'); |
| 55 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 55 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 56 | 56 | |
| 57 | 57 | $value = GETPOST('value', 'alpha'); |
| 58 | 58 | $label = GETPOST('label', 'alpha'); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | $setupnotempty = +count($formSetup->items); |
| 75 | 75 | |
| 76 | -$dirmodels = array_merge(array('/'), (array)$conf->modules_parts['models']); |
|
| 76 | +$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']); |
|
| 77 | 77 | |
| 78 | 78 | /* |
| 79 | 79 | * Actions |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | |
| 88 | 88 | |
| 89 | 89 | // Buttons |
| 90 | -if ((float)DOL_VERSION < 17) { // On v17+, the "New Attribute" button is included into tpl. |
|
| 90 | +if ((float) DOL_VERSION < 17) { // On v17+, the "New Attribute" button is included into tpl. |
|
| 91 | 91 | if ($action != 'create' && $action != 'edit') { |
| 92 | 92 | print '<div class="tabsAction">'; |
| 93 | 93 | print '<a class="butAction reposition" href="' . $_SERVER["PHP_SELF"] . '?action=create">' . $langs->trans("NewAttribute") . '</a>'; |
@@ -217,14 +217,14 @@ |
||
| 217 | 217 | $objthirdparty = $object; |
| 218 | 218 | $objcon = new stdClass(); |
| 219 | 219 | |
| 220 | - $out = '&origin=' . urlencode((string)($object->element . (property_exists($object, 'module') ? '@' . $object->module : ''))) . '&originid=' . urlencode((string)($object->id)); |
|
| 220 | + $out = '&origin=' . urlencode((string) ($object->element . (property_exists($object, 'module') ? '@' . $object->module : ''))) . '&originid=' . urlencode((string) ($object->id)); |
|
| 221 | 221 | $urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id; |
| 222 | 222 | $out .= '&backtopage=' . urlencode($urlbacktopage); |
| 223 | 223 | $permok = $user->hasRight('agenda', 'myactions', 'create'); |
| 224 | 224 | if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) { |
| 225 | 225 | //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'; |
| 226 | 226 | if (get_class($objthirdparty) == 'Societe') { |
| 227 | - $out .= '&socid=' . urlencode((string)($objthirdparty->id)); |
|
| 227 | + $out .= '&socid=' . urlencode((string) ($objthirdparty->id)); |
|
| 228 | 228 | } |
| 229 | 229 | $out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : ''); |
| 230 | 230 | //$out.=$langs->trans("AddAnAction").' '; |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $object = new Calendar($db); |
| 73 | 73 | $extrafields = new ExtraFields($db); |
| 74 | 74 | $diroutputmassaction = $conf->bookcal->dir_output . '/temp/massgeneration/' . $user->id; |
| 75 | -$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
| 75 | +$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes |
|
| 76 | 76 | |
| 77 | 77 | // Fetch optionals attributes and labels |
| 78 | 78 | $extrafields->fetch_name_optionals_label($object->table_element); |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | // Default sort order (if not yet defined by previous GETPOST) |
| 84 | 84 | if (!$sortfield) { |
| 85 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 85 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 86 | 86 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
| 87 | 87 | } |
| 88 | 88 | if (!$sortorder) { |
@@ -130,11 +130,11 @@ discard block |
||
| 130 | 130 | foreach ($object->fields as $key => $val) { |
| 131 | 131 | // If $val['visible']==0, then we never show the field |
| 132 | 132 | if (!empty($val['visible'])) { |
| 133 | - $visible = (int)dol_eval($val['visible'], 1); |
|
| 133 | + $visible = (int) dol_eval($val['visible'], 1); |
|
| 134 | 134 | $arrayfields['t.' . $key] = array( |
| 135 | 135 | 'label' => $val['label'], |
| 136 | 136 | 'checked' => (($visible < 0) ? 0 : 1), |
| 137 | - 'enabled' => (abs($visible) != 3 && (int)dol_eval($val['enabled'], 1)), |
|
| 137 | + 'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)), |
|
| 138 | 138 | 'position' => $val['position'], |
| 139 | 139 | 'help' => isset($val['help']) ? $val['help'] : '' |
| 140 | 140 | ); |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | // Output page |
| 389 | 389 | // -------------------------------------------------------------------- |
| 390 | 390 | |
| 391 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
| 391 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
| 392 | 392 | |
| 393 | 393 | $arrayofselected = is_array($toselect) ? $toselect : array(); |
| 394 | 394 | |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | $param .= '&contextpage=' . urlencode($contextpage); |
| 401 | 401 | } |
| 402 | 402 | if ($limit > 0 && $limit != $conf->liste_limit) { |
| 403 | - $param .= '&limit=' . ((int)$limit); |
|
| 403 | + $param .= '&limit=' . ((int) $limit); |
|
| 404 | 404 | } |
| 405 | 405 | if ($optioncss != '') { |
| 406 | 406 | $param .= '&optioncss=' . urlencode($optioncss); |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | } |
| 506 | 506 | |
| 507 | 507 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 508 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 508 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 509 | 509 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 510 | 510 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 511 | 511 | |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
| 598 | 598 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 599 | 599 | } |
| 600 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 600 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 601 | 601 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 602 | 602 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
| 603 | 603 | $totalarray['nbfield']++; |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | // Default sort order (if not yet defined by previous GETPOST) |
| 81 | 81 | if (!$sortfield) { |
| 82 | - reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 82 | + reset($object->fields); // Reset is required to avoid key() to return null. |
|
| 83 | 83 | $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition. |
| 84 | 84 | } |
| 85 | 85 | if (!$sortorder) { |
@@ -129,11 +129,11 @@ discard block |
||
| 129 | 129 | foreach ($object->fields as $key => $val) { |
| 130 | 130 | // If $val['visible']==0, then we never show the field |
| 131 | 131 | if (!empty($val['visible'])) { |
| 132 | - $visible = (int)dol_eval($val['visible'], 1); |
|
| 132 | + $visible = (int) dol_eval($val['visible'], 1); |
|
| 133 | 133 | $arrayfields['t.' . $key] = array( |
| 134 | 134 | 'label' => $val['label'], |
| 135 | 135 | 'checked' => (($visible < 0) ? 0 : 1), |
| 136 | - 'enabled' => (abs($visible) != 3 && (int)dol_eval($val['enabled'], 1)), |
|
| 136 | + 'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)), |
|
| 137 | 137 | 'position' => $val['position'], |
| 138 | 138 | 'help' => isset($val['help']) ? $val['help'] : '' |
| 139 | 139 | ); |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | // Output page |
| 389 | 389 | // -------------------------------------------------------------------- |
| 390 | 390 | |
| 391 | -llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
| 391 | +llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll |
|
| 392 | 392 | |
| 393 | 393 | // Example : Adding jquery code |
| 394 | 394 | // print '<script type="text/javascript"> |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | $param .= '&contextpage=' . urlencode($contextpage); |
| 416 | 416 | } |
| 417 | 417 | if ($limit > 0 && $limit != $conf->liste_limit) { |
| 418 | - $param .= '&limit=' . ((int)$limit); |
|
| 418 | + $param .= '&limit=' . ((int) $limit); |
|
| 419 | 419 | } |
| 420 | 420 | if ($optioncss != '') { |
| 421 | 421 | $param .= '&optioncss=' . urlencode($optioncss); |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | } |
| 520 | 520 | |
| 521 | 521 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 522 | -$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 522 | +$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup |
|
| 523 | 523 | $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : ''); |
| 524 | 524 | $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); |
| 525 | 525 | |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) { |
| 613 | 613 | $cssforfield .= ($cssforfield ? ' ' : '') . 'right'; |
| 614 | 614 | } |
| 615 | - $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 615 | + $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label |
|
| 616 | 616 | if (!empty($arrayfields['t.' . $key]['checked'])) { |
| 617 | 617 | print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, ($cssforfield ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield . ' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist'])) . "\n"; |
| 618 | 618 | $totalarray['nbfield']++; |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | $confirm = GETPOST('confirm', 'alpha'); |
| 41 | 41 | $cancel = GETPOST('cancel', 'aZ09'); |
| 42 | 42 | $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)) . basename(__FILE__, '.php')); // To manage different context of search |
| 43 | -$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used |
|
| 43 | +$backtopage = GETPOST('backtopage', 'alpha'); // if not set, a default page will be used |
|
| 44 | 44 | $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used |
| 45 | 45 | $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha'); |
| 46 | 46 | $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09'); |
@@ -217,14 +217,14 @@ |
||
| 217 | 217 | $objthirdparty = $object; |
| 218 | 218 | $objcon = new stdClass(); |
| 219 | 219 | |
| 220 | - $out = '&origin=' . urlencode((string)($object->element . '@' . $object->module)) . '&originid=' . urlencode((string)($object->id)); |
|
| 220 | + $out = '&origin=' . urlencode((string) ($object->element . '@' . $object->module)) . '&originid=' . urlencode((string) ($object->id)); |
|
| 221 | 221 | $urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id; |
| 222 | 222 | $out .= '&backtopage=' . urlencode($urlbacktopage); |
| 223 | 223 | $permok = $user->hasRight('agenda', 'myactions', 'create'); |
| 224 | 224 | if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) { |
| 225 | 225 | //$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'; |
| 226 | 226 | if (get_class($objthirdparty) == 'Societe') { |
| 227 | - $out .= '&socid=' . urlencode((string)($objthirdparty->id)); |
|
| 227 | + $out .= '&socid=' . urlencode((string) ($objthirdparty->id)); |
|
| 228 | 228 | } |
| 229 | 229 | $out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : ''); |
| 230 | 230 | //$out.=$langs->trans("AddAnAction").' '; |
@@ -188,7 +188,7 @@ |
||
| 188 | 188 | $sql = "SELECT ac.id, ac.ref, ac.datep as date_start, ac.datep2 as date_end, ac.label, acr.fk_element"; |
| 189 | 189 | $sql .= " FROM " . MAIN_DB_PREFIX . "actioncomm as ac"; |
| 190 | 190 | $sql .= " JOIN " . MAIN_DB_PREFIX . "actioncomm_resources as acr on acr.fk_actioncomm = ac.id"; |
| 191 | - $sql .= " WHERE ac.fk_bookcal_calendar = " . ((int)$object->id); |
|
| 191 | + $sql .= " WHERE ac.fk_bookcal_calendar = " . ((int) $object->id); |
|
| 192 | 192 | $sql .= " AND ac.code = 'AC_RDV'"; |
| 193 | 193 | $sql .= " AND acr.element_type = 'socpeople'"; |
| 194 | 194 | $resql = $db->query($sql); |