--- /tmp/dsg/dolibarr/htdocs/variants/admin/github_admin.php
+++ /tmp/dsg/dolibarr/htdocs/variants/admin/client_admin.php
@@ -22,69 +22,51 @@
 

 $langs->loadLangs(array("admin", "products"));

 

-$action = GETPOST('action', 'alphanohtml');

-

 // Security check

 if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))

 	accessforbidden();

 

-$error = 0;

-

-

-/*

- * Actions

- */

-

-if ($action) {

+if ($_POST) {

 	$value = GETPOST('PRODUIT_ATTRIBUTES_HIDECHILD');

 

-	if (!dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_HIDECHILD', $value, 'chaine', 0, '', $conf->entity)) {

+	if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_HIDECHILD', $value, 'chaine', 0, '', $conf->entity)) {

+		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');

+	} else {

 		setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');

-		$error++;

 	}

 

-	if (!dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) {

-		setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');

-		$error++;

-	}

-

-	if (!$error) {

-		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');

-	}

+    if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) {

+        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');

+    } else {

+        setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors');

+    }

 }

 

-$title = $langs->trans('ModuleSetup').' '.$langs->trans('Module610Name');

+$title = $langs->trans('ModuleSetup').' '.$langs->trans('ProductAttributes');

 llxHeader('', $title);

 

 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';

 print load_fiche_titre($title, $linkback, 'title_setup');

 

-print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';

-print '<input type="hidden" name="token" value="'.newToken().'">';

-print '<input type="hidden" name="action" value="update">';

+dol_fiche_head(array(), 'general', $tab, 0, 'product');

 

+print '<form method="post">';

 print '<table class="noborder centpercent">';

-

 print '<tr class="liste_titre">';

-print '<th>'.$langs->trans("Parameters").'</th>'."\n";

-print '<th class="right" width="60">'.$langs->trans("Value").'</th>'."\n";

-print '</tr>'."\n";

-

+print '<th>'.$langs->trans("Parameters").'</td>'."\n";

+print '<th class="right" width="60">'.$langs->trans("Value").'</td>'."\n";

+print '<th width="80">&nbsp;</td></tr>'."\n";

 print '<tr class="oddeven"><td>'.$langs->trans('HideProductCombinations').'</td><td>';

 print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", $conf->global->PRODUIT_ATTRIBUTES_HIDECHILD, 1).'</td></tr>';

-

 print '<tr class="oddeven"><td>'.$langs->trans('CombinationsSeparator').'</td>';

 if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {

-	$separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;

+    $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;

 } else {

-	$separator = "_";

+    $separator = "_";

 }

 print '<td class="right"><input size="3" type="text" class="flat" name="PRODUIT_ATTRIBUTES_SEPARATOR" value="'.$separator.'"></td></tr>';

-

 print '</table>';

-

-print '<br><div class="center"><input type="submit" value="'.$langs->trans("Save").'" class="button button-save"></div>';

-

+print '<br><div class="center"><input type="submit" value="'.$langs->trans('Save').'" class="button"></div>';

 print '</form>';

 

 // End of page