--- /tmp/dsg/dolibarr/htdocs/variants/admin/github_19.0.3_admin.php
+++ /tmp/dsg/dolibarr/htdocs/variants/admin/client_admin.php
@@ -19 +18,0 @@
-// Load Dolibarr environment

@@ -26 +25,3 @@
-$action = GETPOST('action', 'alphanohtml');

+// Security check

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

+	accessforbidden();

@@ -28,3 +29,14 @@
-// Security check

-if (!$user->admin || !isModEnabled('variants')) {

-	accessforbidden();

+if ($_POST) {

+	$value = GETPOST('PRODUIT_ATTRIBUTES_HIDECHILD');

+

+	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');

+	}

+

+    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');

+    }

@@ -33,26 +45 @@
-$error = 0;

-

-

-/*

- * Actions

- */

-

-if ($action) {

-	$value = GETPOST('PRODUIT_ATTRIBUTES_HIDECHILD');

-

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

-		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');

-	}

-}

-

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

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

@@ -64,3 +51 @@
-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');

@@ -67,0 +53 @@
+print '<form method="post">';

@@ -69 +54,0 @@
-

@@ -71,4 +56,3 @@
-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";

@@ -76,2 +60 @@
-print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", getDolGlobalString('PRODUIT_ATTRIBUTES_HIDECHILD'), 1).'</td></tr>';

-

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

@@ -80 +63 @@
-	$separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;

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

@@ -82 +65 @@
-	$separator = "_";

+    $separator = "_";

@@ -85 +67,0 @@
-

@@ -87,3 +69 @@
-

-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>';