diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 18c4f12ac27..5227c1883e4 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -182,10 +182,10 @@ if ($_POST["action"] == 'add_action') $actioncomm->note = trim($_POST["note"]); if (isset($_POST["contactid"])) $actioncomm->contact = $contact; - if (isset($_REQUEST["socid"]) && $_REQUEST["socid"] > 0) + if (GETPOST("socid") > 0) { $societe = new Societe($db); - $societe->fetch($_REQUEST["socid"]); + $societe->fetch(GETPOST("socid")); $actioncomm->societe = $societe; } @@ -245,7 +245,7 @@ if ($_POST["action"] == 'add_action') { // Si erreur $db->rollback(); - $_GET["id"]=$idaction; + $id=$idaction; $langs->load("errors"); $error=$langs->trans($actioncomm->error); } @@ -253,22 +253,20 @@ if ($_POST["action"] == 'add_action') else { $db->rollback(); - $_GET["id"]=$idaction; + $id=$idaction; $langs->load("errors"); $error=$langs->trans($actioncomm->error); } } - - // print $_REQUEST["from"]."rr"; } /* * Action suppression de l'action */ -if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes') +if (GETPOST("action") == 'confirm_delete' && GETPOST("confirm") == 'yes') { $actioncomm = new ActionComm($db); - $actioncomm->fetch($_GET["id"]); + $actioncomm->fetch($id); if ($user->rights->agenda->myactions->delete || $user->rights->agenda->allactions->delete) @@ -290,7 +288,7 @@ if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes') /* * Action mise a jour de l'action */ -if ($_POST["action"] == 'update') +if (GETPOST("action") == 'update') { if (! $_POST["cancel"]) { @@ -352,7 +350,7 @@ if ($_POST["action"] == 'update') if (! $datep2 && $_POST["percentage"] == 100) { $error=$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd")); - $_REQUEST["action"] = 'edit'; + $_GET["action"] = 'edit'; } // Users @@ -390,7 +388,6 @@ if ($_POST["action"] == 'update') { $langs->load("errors"); $mesg='