Uniformisation du code par utilisation de la fonction dolibarr_set_const

This commit is contained in:
Laurent Destailleur 2007-10-07 14:45:42 +00:00
parent e6e0f046bd
commit 0f49ae8e44
4 changed files with 123 additions and 156 deletions

View File

@ -39,75 +39,47 @@ if (!$user->admin)
accessforbidden(); accessforbidden();
// positionne la variable pour le test d'affichage de l'icone
$main_use_mailman = ADHERENT_USE_MAILMAN;
$main_use_glasnost = ADHERENT_USE_GLASNOST;
$main_use_glasnost_auto = ADHERENT_USE_GLASNOST_AUTO;
$main_use_spip = ADHERENT_USE_SPIP;
$main_use_spip_auto = ADHERENT_USE_SPIP_AUTO;
$typeconst=array('yesno','texte','chaine'); $typeconst=array('yesno','texte','chaine');
$var=True;
// Action mise a jour ou ajout d'une constante // Action mise a jour ou ajout d'une constante
if ($_POST["action"] == 'update' || $_POST["action"] == 'add') if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
{ {
if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'')) $result=dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'');
if ($result < 0)
{ {
print $db->error(); print $db->error();
} }
else
{
Header("Location: adherent.php");
exit;
}
} }
// Action activation d'un sous module du module adhérent // Action activation d'un sous module du module adhérent
if ($_GET["action"] == 'set') if ($_GET["action"] == 'set')
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$_GET["name"]."' ;"; $result=dolibarr_set_const($db, $_GET["name"],$_GET["value"]);
$result=$db->query($sql); if ($result < 0)
if (! $result) {
dolibarr_print_error($db);
exit;
}
$sql ='';
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,visible) values ('".$_GET["name"]."','".$_GET["value"]."', 0);";
$result=$db->query($sql);
if ($result)
{ {
Header("Location: adherent.php"); print $db->error();
exit;
}
else {
dolibarr_print_error($db);
exit;
} }
} }
// Action désactivation d'un sous module du module adhérent // Action désactivation d'un sous module du module adhérent
if ($_GET["action"] == 'unset') if ($_GET["action"] == 'unset')
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = '".$_GET["name"]."'"; $result=dolibarr_del_const($db,$_GET["name"]);
if ($result < 0)
if ($db->query($sql))
{ {
Header("Location: adherent.php"); print $db->error();
exit;
} }
} }
llxHeader(); llxHeader();
/* /*
* Interface de configuration de certaines variables de la partie adherent * Interface de configuration de certaines variables de la partie adherent
*/ */
$var=True;
print_fiche_titre($langs->trans("MembersSetup"),'','setup'); print_fiche_titre($langs->trans("MembersSetup"),'','setup');
print "<br>"; print "<br>";

View File

@ -38,7 +38,11 @@ if (!$user->admin)
if ($_POST["action"] == 'set') if ($_POST["action"] == 'set')
{ {
$name = "EDITEUR_LIVRE_FORMAT_".time(); $name = "EDITEUR_LIVRE_FORMAT_".time();
dolibarr_set_const($db, $name, $_POST["format"]); $result=dolibarr_set_const($db, $name, $_POST["format"]);
if ($result < 0)
{
print $db->error();
}
} }
// Action désactivation d'un sous module du module adhérent // Action désactivation d'un sous module du module adhérent

View File

@ -180,6 +180,19 @@ while (($file = readdir($handle))!==false)
$j = 1000 + $i; $j = 1000 + $i;
} }
$modulequalified=1;
// We discard modules that does not respect constraint on menu handlers
if ($objMod->needleftmenu && sizeof($objMod->needleftmenu) && ! in_array($conf->left_menu,$objMod->needleftmenu)) $modulequalified=0;
if ($objMod->needtopmenu && sizeof($objMod->needtopmenu) && ! in_array($conf->top_menu,$objMod->needtopmenu)) $modulequalified=0;
// We dsicard modules according to features level (if active we always show them)
$const_name = $objMod->const_name;
if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && ! $conf->global->$const_name) $modulequalified=0;
if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && ! $conf->global->$const_name) $modulequalified=0;
if ($modulequalified)
{
$modules[$i] = $objMod; $modules[$i] = $objMod;
$filename[$i]= $modName; $filename[$i]= $modName;
$orders[$i] = "$objMod->family"."_".$j; // Tri par famille puis numero module $orders[$i] = "$objMod->family"."_".$j; // Tri par famille puis numero module
@ -188,6 +201,7 @@ while (($file = readdir($handle))!==false)
$i++; $i++;
} }
} }
}
} }
asort($orders); asort($orders);
@ -280,10 +294,6 @@ foreach ($orders as $key => $value)
$modName = $filename[$key]; $modName = $filename[$key];
$objMod = $modules[$key]; $objMod = $modules[$key];
// Show modules according to features level
if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
$const_name = $objMod->const_name; $const_name = $objMod->const_name;
if ($oldfamily && $family!=$oldfamily && $atleastoneforfamily) { if ($oldfamily && $family!=$oldfamily && $atleastoneforfamily) {

View File

@ -42,14 +42,10 @@ if (!$user->admin)
if ($_POST["action"] == 'nbprod') if ($_POST["action"] == 'nbprod')
{ {
dolibarr_set_const($db, "PRODUIT_LIMIT_SIZE", $_POST["value"]); dolibarr_set_const($db, "PRODUIT_LIMIT_SIZE", $_POST["value"]);
Header("Location: produit.php");
exit;
} }
else if ($_POST["action"] == 'multiprix_num') else if ($_POST["action"] == 'multiprix_num')
{ {
dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", $_POST["value"]); dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", $_POST["value"]);
Header("Location: produit.php");
exit;
} }
if ($_POST["action"] == 'multiprix') if ($_POST["action"] == 'multiprix')
{ {
@ -68,16 +64,12 @@ if ($_POST["action"] == 'multiprix')
} }
dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"]); dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"]);
dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6"); dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6");
Header("Location: produit.php");
exit;
} }
else else
{ {
dolibarr_syslog("Table definition for ".MAIN_DB_PREFIX."societe already ok"); dolibarr_syslog("Table definition for ".MAIN_DB_PREFIX."societe already ok");
dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"]); dolibarr_set_const($db, "PRODUIT_MULTIPRICES", $_POST["activate_multiprix"]);
dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6"); dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", "6");
Header("Location: produit.php");
exit;
} }
} }
else if ($_POST["action"] == 'sousproduits') else if ($_POST["action"] == 'sousproduits')
@ -99,66 +91,47 @@ else if ($_POST["action"] == 'sousproduits')
else else
{ {
dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $_POST["activate_sousproduits"]); dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $_POST["activate_sousproduits"]);
Header("Location: produit.php");
exit;
} }
} }
else else
{ {
dolibarr_syslog("Table definition already ok"); dolibarr_syslog("Table definition already ok");
dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $_POST["activate_sousproduits"]); dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $_POST["activate_sousproduits"]);
Header("Location: produit.php");
exit;
} }
} }
else if ($_POST["action"] == 'changeproductdesc') else if ($_POST["action"] == 'changeproductdesc')
{ {
dolibarr_set_const($db, "PRODUIT_CHANGE_PROD_DESC", $_POST["activate_changeproductdesc"]); dolibarr_set_const($db, "PRODUIT_CHANGE_PROD_DESC", $_POST["activate_changeproductdesc"]);
Header("Location: produit.php");
exit;
} }
else if ($_POST["action"] == 'viewProdDescInForm') else if ($_POST["action"] == 'viewProdDescInForm')
{ {
dolibarr_set_const($db, "PRODUIT_DESC_IN_FORM", $_POST["activate_viewProdDescInForm"]); dolibarr_set_const($db, "PRODUIT_DESC_IN_FORM", $_POST["activate_viewProdDescInForm"]);
Header("Location: produit.php");
exit;
} }
else if ($_POST["action"] == 'confirmDeleteProdLineInForm') else if ($_POST["action"] == 'confirmDeleteProdLineInForm')
{ {
dolibarr_set_const($db, "PRODUIT_CONFIRM_DELETE_LINE", $_POST["activate_confirmDeleteProdLineInForm"]); dolibarr_set_const($db, "PRODUIT_CONFIRM_DELETE_LINE", $_POST["activate_confirmDeleteProdLineInForm"]);
Header("Location: produit.php");
exit;
} }
else if ($_POST["action"] == 'ProductCanvasAbility') else if ($_POST["action"] == 'ProductCanvasAbility')
{ {
dolibarr_set_const($db, "PRODUCT_CANVAS_ABILITY", $_POST["ProductCanvasAbility"]); dolibarr_set_const($db, "PRODUCT_CANVAS_ABILITY", $_POST["ProductCanvasAbility"]);
Header("Location: produit.php");
exit;
} }
else if ($_POST["action"] == 'usesearchtoselectproduct') else if ($_POST["action"] == 'usesearchtoselectproduct')
{ {
dolibarr_set_const($db, "PRODUIT_USE_SEARCH_TO_SELECT", $_POST["activate_usesearchtoselectproduct"]); dolibarr_set_const($db, "PRODUIT_USE_SEARCH_TO_SELECT", $_POST["activate_usesearchtoselectproduct"]);
Header("Location: produit.php");
exit;
} }
else if ($_GET["action"] == 'set') else if ($_GET["action"] == 'set')
{ {
$const = "PRODUIT_SPECIAL_".strtoupper($_GET["spe"]); $const = "PRODUIT_SPECIAL_".strtoupper($_GET["spe"]);
dolibarr_set_const($db, $const, $_GET["value"]); if ($_GET["value"]) dolibarr_set_const($db, $const, $_GET["value"]);
Header("Location: produit.php"); else dolibarr_del_const($db, $const);
exit;
} }
else if ($_POST["action"] == 'useecotaxe') else if ($_POST["action"] == 'useecotaxe')
{ {
dolibarr_set_const($db, "PRODUIT_USE_ECOTAXE", $_POST["activate_useecotaxe"]); dolibarr_set_const($db, "PRODUIT_USE_ECOTAXE", $_POST["activate_useecotaxe"]);
Header("Location: produit.php");
exit;
} }
else if ($_POST["action"] == 'setdefaultbarcodetype') else if ($_POST["action"] == 'setdefaultbarcodetype')
{ {
dolibarr_set_const($db, "PRODUIT_DEFAULT_BARCODE_TYPE", $_POST["coder_id"]); dolibarr_set_const($db, "PRODUIT_DEFAULT_BARCODE_TYPE", $_POST["coder_id"]);
Header("Location: produit.php");
exit;
} }
@ -198,7 +171,7 @@ $var=!$var;
print "<form method=\"post\" action=\"produit.php\">"; print "<form method=\"post\" action=\"produit.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"multiprix\">"; print "<input type=\"hidden\" name=\"action\" value=\"multiprix\">";
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("MultiPricesAbility").'</td>'; print '<td>'.$langs->trans("MultiPricesAbility").'</td>';
print '<td width="60" align="right">'; print '<td width="60" align="right">';
print $html->selectyesno("activate_multiprix",$conf->global->PRODUIT_MULTIPRICES,1); print $html->selectyesno("activate_multiprix",$conf->global->PRODUIT_MULTIPRICES,1);
print '</td><td align="right">'; print '</td><td align="right">';
@ -227,7 +200,7 @@ $var=!$var;
print "<form method=\"post\" action=\"produit.php\">"; print "<form method=\"post\" action=\"produit.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"sousproduits\">"; print "<input type=\"hidden\" name=\"action\" value=\"sousproduits\">";
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("AssociatedProductsAbility").'</td>'; print '<td>'.$langs->trans("AssociatedProductsAbility").'</td>';
print '<td width="60" align="right">'; print '<td width="60" align="right">';
print $html->selectyesno("activate_sousproduits",$conf->global->PRODUIT_SOUSPRODUITS,1); print $html->selectyesno("activate_sousproduits",$conf->global->PRODUIT_SOUSPRODUITS,1);
print '</td><td align="right">'; print '</td><td align="right">';
@ -241,7 +214,7 @@ $var=!$var;
print "<form method=\"post\" action=\"produit.php\">"; print "<form method=\"post\" action=\"produit.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"usesearchtoselectproduct\">"; print "<input type=\"hidden\" name=\"action\" value=\"usesearchtoselectproduct\">";
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("UseSearchToSelectProduct").'</td>'; print '<td>'.$langs->trans("UseSearchToSelectProduct").'</td>';
if (! $conf->use_ajax) if (! $conf->use_ajax)
{ {
print '<td nowrap="nowrap" align="right" colspan="2">'; print '<td nowrap="nowrap" align="right" colspan="2">';
@ -265,7 +238,7 @@ $var=!$var;
print "<form method=\"post\" action=\"produit.php\">"; print "<form method=\"post\" action=\"produit.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"changeproductdesc\">"; print "<input type=\"hidden\" name=\"action\" value=\"changeproductdesc\">";
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("ModifyProductDescAbility").'</td>'; print '<td>'.$langs->trans("ModifyProductDescAbility").'</td>';
print '<td width="60" align="right">'; print '<td width="60" align="right">';
print $html->selectyesno("activate_changeproductdesc",$conf->global->PRODUIT_CHANGE_PROD_DESC,1); print $html->selectyesno("activate_changeproductdesc",$conf->global->PRODUIT_CHANGE_PROD_DESC,1);
print '</td><td align="right">'; print '</td><td align="right">';
@ -279,7 +252,7 @@ $var=!$var;
print "<form method=\"post\" action=\"produit.php\">"; print "<form method=\"post\" action=\"produit.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"viewProdDescInForm\">"; print "<input type=\"hidden\" name=\"action\" value=\"viewProdDescInForm\">";
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("ViewProductDescInFormAbility").'</td>'; print '<td>'.$langs->trans("ViewProductDescInFormAbility").'</td>';
print '<td width="60" align="right">'; print '<td width="60" align="right">';
print $html->selectyesno("activate_viewProdDescInForm",$conf->global->PRODUIT_DESC_IN_FORM,1); print $html->selectyesno("activate_viewProdDescInForm",$conf->global->PRODUIT_DESC_IN_FORM,1);
print '</td><td align="right">'; print '</td><td align="right">';
@ -293,7 +266,7 @@ $var=!$var;
print "<form method=\"post\" action=\"produit.php\">"; print "<form method=\"post\" action=\"produit.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"confirmDeleteProdLineInForm\">"; print "<input type=\"hidden\" name=\"action\" value=\"confirmDeleteProdLineInForm\">";
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("ConfirmDeleteProductLineAbility").'</td>'; print '<td>'.$langs->trans("ConfirmDeleteProductLineAbility").'</td>';
print '<td width="60" align="right">'; print '<td width="60" align="right">';
print $html->selectyesno("activate_confirmDeleteProdLineInForm",$conf->global->PRODUIT_CONFIRM_DELETE_LINE,1); print $html->selectyesno("activate_confirmDeleteProdLineInForm",$conf->global->PRODUIT_CONFIRM_DELETE_LINE,1);
print '</td><td align="right">'; print '</td><td align="right">';
@ -307,7 +280,7 @@ $var=!$var;
print "<form method=\"post\" action=\"produit.php\">"; print "<form method=\"post\" action=\"produit.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"useecotaxe\">"; print "<input type=\"hidden\" name=\"action\" value=\"useecotaxe\">";
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("UseEcoTaxeAbility").'</td>'; print '<td>'.$langs->trans("UseEcoTaxeAbility").'</td>';
print '<td width="60" align="right">'; print '<td width="60" align="right">';
print $html->selectyesno("activate_useecotaxe",$conf->global->PRODUIT_USE_ECOTAXE,1); print $html->selectyesno("activate_useecotaxe",$conf->global->PRODUIT_USE_ECOTAXE,1);
print '</td><td align="right">'; print '</td><td align="right">';
@ -323,7 +296,7 @@ if ($conf->barcode->enabled && $conf->global->PRODUIT_USE_BARCODE)
print "<form method=\"post\" action=\"produit.php\">"; print "<form method=\"post\" action=\"produit.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"setdefaultbarcodetype\">"; print "<input type=\"hidden\" name=\"action\" value=\"setdefaultbarcodetype\">";
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("SetDefaultBarcodeType").'</td>'; print '<td>'.$langs->trans("SetDefaultBarcodeType").'</td>';
print '<td width="60" align="right">'; print '<td width="60" align="right">';
print $html->select_barcode_type($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE,"coder_id",1); print $html->select_barcode_type($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE,"coder_id",1);
print '</td><td align="right">'; print '</td><td align="right">';
@ -333,31 +306,37 @@ if ($conf->barcode->enabled && $conf->global->PRODUIT_USE_BARCODE)
print '</form>'; print '</form>';
} }
print '<tr class="liste_titre">';
print " <td>".$langs->trans("ProductSpecial")."</td>\n";
print " <td align=\"right\" width=\"60\">".$langs->trans("Value")."</td>\n";
print " <td width=\"80\">&nbsp;</td></tr>\n";
print '<form method="post" action="produit.php">'; if ($conf->left_menu == 'default.php')
print '<input type="hidden" name="action" value="ProductCanvasAbility">';
print "<tr ".$bc[$var].">";
print '<td width="80%">'.$langs->trans("ProductCanvasAbility").'</td>';
print '<td width="60" align="right">';
print $html->selectyesno("ProductCanvasAbility",$conf->global->PRODUCT_CANVAS_ABILITY,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
print '</tr></form>';
require_once(DOL_DOCUMENT_ROOT . "/product.class.php");
$dir = DOL_DOCUMENT_ROOT . "/product/canvas/";
if ($conf->global->PRODUCT_CANVAS_ABILITY==="1")
{ {
// Propose utilisation de canvas.
// Ces derniers ne sont geres que par le menu default
$var = false;
print '<tr class="liste_titre">';
print " <td>".$langs->trans("ProductSpecial")."</td>\n";
print " <td align=\"right\" width=\"60\">".$langs->trans("Value")."</td>\n";
print " <td width=\"80\">&nbsp;</td></tr>\n";
print '<form method="post" action="produit.php">';
print '<input type="hidden" name="action" value="ProductCanvasAbility">';
print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("ProductCanvasAbility").'</td>';
print '<td width="60" align="right">';
print $html->selectyesno("ProductCanvasAbility",$conf->global->PRODUCT_CANVAS_ABILITY,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
print '</tr></form>';
require_once(DOL_DOCUMENT_ROOT . "/product.class.php");
$dir = DOL_DOCUMENT_ROOT . "/product/canvas/";
if ($conf->global->PRODUCT_CANVAS_ABILITY)
{
if(is_dir($dir) ) if(is_dir($dir) )
{ {
$handle=opendir($dir); $handle=opendir($dir);
$var=true;
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
@ -373,17 +352,18 @@ if ($conf->global->PRODUCT_CANVAS_ABILITY==="1")
print $module->description; print $module->description;
print '</td><td align="center">'; print '</td><td align="right">';
if (defined ("PRODUIT_SPECIAL_LIVRE") && PRODUIT_SPECIAL_LIVRE == 1) $const = "PRODUIT_SPECIAL_".strtoupper($parts[1]);
if ($conf->global->$const)
{ {
print img_tick(); print img_tick();
print '</td><td align="center">'; print '</td><td align="right">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$parts[1].'&amp;value=0">'.$langs->trans("Disable").'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$parts[1].'&amp;value=0">'.$langs->trans("Disable").'</a>';
} }
else else
{ {
print '&nbsp;</td><td align="center">'; print '&nbsp;</td><td align="right">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$parts[1].'&amp;value=1">'.$langs->trans("Activate").'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$parts[1].'&amp;value=1">'.$langs->trans("Activate").'</a>';
} }
@ -396,8 +376,9 @@ if ($conf->global->PRODUCT_CANVAS_ABILITY==="1")
{ {
print "<tr><td><b>ERROR</b>: $dir is not a directory !</td></tr>\n"; print "<tr><td><b>ERROR</b>: $dir is not a directory !</td></tr>\n";
} }
}
print '</table>';
} }
print '</table>';
$db->close(); $db->close();