diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 2afd0745c8e..71cc0bc58ce 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -130,7 +130,7 @@ if ($action == 'add') { if (! $error) { $object->id_origin = $id; $object->titre = GETPOST('titre', 'alpha'); - $object->description = GETPOST('description', 'alpha'); + $object->description = GETPOST('description', 'restricthtml'); $object->socid = GETPOST('socid', 'alpha'); $object->fk_project = GETPOST('projectid', 'int'); $object->fk_contract = GETPOST('contractid', 'int'); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index abcea896c06..e313856664b 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -216,7 +216,7 @@ if (empty($reshook)) $object->fk_project = GETPOST('projectid', 'int'); $object->fk_contrat = GETPOST('contratid', 'int'); $object->author = $user->id; - $object->description = GETPOST('description', 'none'); + $object->description = GETPOST('description', 'restricthtml'); $object->ref = $ref; $object->modelpdf = GETPOST('model', 'alpha'); $object->note_private = GETPOST('note_private', 'none'); @@ -438,7 +438,7 @@ if (empty($reshook)) $object->fk_project = GETPOST('projectid', 'int'); $object->fk_contrat = GETPOST('contratid', 'int'); $object->author = $user->id; - $object->description = GETPOST('description', 'alpha'); + $object->description = GETPOST('description', 'restricthtml'); $object->ref = $ref; $result=$object->update($user); diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 6518258b508..458e92df34b 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -125,7 +125,7 @@ if ($action == 'create') elseif ($endhalfday == 'morning') $halfday=1; $valideur = GETPOST('valideur', 'int'); - $description = trim(GETPOST('description')); + $description = trim(GETPOST('description', 'restricthtml')); // If no type if ($type <= 0) @@ -273,7 +273,7 @@ if ($action == 'update' && ! GETPOSTISSET('savevalidator')) if ($cancreate) { $valideur = GETPOST('valideur', 'int'); - $description = trim(GETPOST('description', 'none')); + $description = trim(GETPOST('description', 'restricthtml')); // If no start date if (empty($_POST['date_debut_'])) { @@ -1047,7 +1047,7 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $ print ''; print ''.$langs->trans("DescCP").''; print ''; - $doleditor = new DolEditor('description', GETPOST('description', 'none'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%'); + $doleditor = new DolEditor('description', GETPOST('description', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%'); print $doleditor->Create(1); print ''; diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php index 91ef33694c5..2c65a02a716 100644 --- a/htdocs/product/admin/dynamic_prices.php +++ b/htdocs/product/admin/dynamic_prices.php @@ -101,11 +101,11 @@ if (!empty($action) && empty($cancel)) { //Updaters actions if ($action == 'create_updater' || $action == 'edit_updater') { - $price_updaters->type = isset($_POST['type'])?GETPOST('type', 'int'):$price_updaters->type; - $price_updaters->description = isset($_POST['description'])?GETPOST('description', 'alpha'):$price_updaters->description; - $price_updaters->parameters = isset($_POST['parameters'])?GETPOST('parameters'):$price_updaters->parameters; - $price_updaters->fk_variable = isset($_POST['fk_variable'])?GETPOST('fk_variable', 'int'):$price_updaters->fk_variable; - $price_updaters->update_interval = isset($_POST['update_interval'])?GETPOST('update_interval', 'int'):$price_updaters->update_interval; + $price_updaters->type = GETPOSTISSET('type') ? GETPOST('type', 'int') : $price_updaters->type; + $price_updaters->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_updaters->description; + $price_updaters->parameters = GETPOSTISSET('parameters') ? GETPOST('parameters', 'alphanohtml') : $price_updaters->parameters; + $price_updaters->fk_variable = GETPOSTISSET('fk_variable') ? GETPOST('fk_variable', 'int') : $price_updaters->fk_variable; + $price_updaters->update_interval = GETPOSTISSET('update_interval') ? GETPOST('update_interval', 'int') : $price_updaters->update_interval; } if ($action == 'create_updater' && !empty($save)) { //Verify if process() works diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 88bda602721..6a84da4dd23 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -152,7 +152,7 @@ if (empty($reshook)) $object->ref = GETPOST('ref', 'alpha'); $object->title = GETPOST('title', 'none'); // Do not use 'alpha' here, we want field as it is $object->socid = GETPOST('socid', 'int'); - $object->description = GETPOST('description', 'none'); // Do not use 'alpha' here, we want field as it is + $object->description = GETPOST('description', 'restricthtml'); // Do not use 'alpha' here, we want field as it is $object->public = GETPOST('public', 'alpha'); $object->opp_amount = price2num(GETPOST('opp_amount', 'alpha')); $object->budget_amount = price2num(GETPOST('budget_amount', 'alpha')); @@ -255,7 +255,7 @@ if (empty($reshook)) $object->title = GETPOST('title', 'none'); // Do not use 'alpha' here, we want field as it is $object->statut = GETPOST('status', 'int'); $object->socid = GETPOST('socid', 'int'); - $object->description = GETPOST('description', 'none'); // Do not use 'alpha' here, we want field as it is + $object->description = GETPOST('description', 'restricthtml'); // Do not use 'alpha' here, we want field as it is $object->public = GETPOST('public', 'alpha'); $object->date_start = empty($_POST["projectstart"])?'':$date_start; $object->date_end = empty($_POST["projectend"])?'':$date_end; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 6fd6e8ac8ec..c6a037ec111 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -91,7 +91,7 @@ $hookmanager->initHooks(array('projecttaskscard','globalcard')); $progress=GETPOST('progress', 'int'); $label=GETPOST('label', 'alpha'); -$description=GETPOST('description'); +$description = GETPOST('description', 'restricthtml'); $planned_workloadhour=(GETPOST('planned_workloadhour', 'int')?GETPOST('planned_workloadhour', 'int'):0); $planned_workloadmin=(GETPOST('planned_workloadmin', 'int')?GETPOST('planned_workloadmin', 'int'):0); $planned_workload=$planned_workloadhour*3600+$planned_workloadmin*60; diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php index 4ec52539188..ef24616c1ad 100644 --- a/htdocs/resource/card.php +++ b/htdocs/resource/card.php @@ -35,11 +35,11 @@ $langs->loadLangs(array('resource', 'companies', 'other', 'main')); // Get parameters $id = GETPOST('id', 'int'); -$action = GETPOST('action', 'alpha'); +$action = GETPOST('action', 'aZ09'); $cancel = GETPOST('cancel', 'alpha'); $ref = GETPOST('ref', 'alpha'); -$description = GETPOST('description'); -$confirm = GETPOST('confirm'); +$description = GETPOST('description', 'restricthtml'); +$confirm = GETPOST('confirm', 'aZ09'); $fk_code_type_resource = GETPOST('fk_code_type_resource', 'alpha'); $country_id = GETPOST('country_id', 'int');