Fix: Accept _ in attribut type name. Better error management.
This commit is contained in:
Laurent Destailleur
parent
8246e1de5c
commit
2b084e56bd
@ -125,7 +125,7 @@ class AdherentOptions
|
||||
|
||||
}
|
||||
|
||||
/*!
|
||||
/**
|
||||
\brief fonction qui crée un attribut optionnel
|
||||
\param attrname nom de l'atribut
|
||||
\param type type de l'attribut
|
||||
@ -133,12 +133,10 @@ class AdherentOptions
|
||||
|
||||
\remarks Ceci correspond a une modification de la table et pas a un rajout d'enregistrement
|
||||
*/
|
||||
|
||||
function create($attrname,$type='varchar',$length=255) {
|
||||
/*
|
||||
* Insertion dans la base
|
||||
*/
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-]*$/",$attrname)){
|
||||
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
|
||||
{
|
||||
$sql = "ALTER TABLE ".MAIN_DB_PREFIX."adherent_options ";
|
||||
switch ($type){
|
||||
case 'varchar' :
|
||||
@ -155,6 +153,7 @@ class AdherentOptions
|
||||
break;
|
||||
}
|
||||
|
||||
dolibarr_syslog("AdherentOptions::create sql=".$sql);
|
||||
if ($this->db->query($sql))
|
||||
{
|
||||
return 1;
|
||||
@ -169,21 +168,21 @@ class AdherentOptions
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
/**
|
||||
\brief fonction qui crée un label
|
||||
\param attrname nom de l'atribut
|
||||
\param label nom du label
|
||||
*/
|
||||
function create_label($attrname,$label='')
|
||||
{
|
||||
|
||||
function create_label($attrname,$label='') {
|
||||
/*
|
||||
* Insertion dans la base
|
||||
*/
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-]*$/",$attrname)) {
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
|
||||
{
|
||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_options_label SET ";
|
||||
$escaped_label=mysql_escape_string($label);
|
||||
$sql .= " name='$attrname',label='$escaped_label' ";
|
||||
$sql .= " name='$attrname',label='".addslashes($escaped_label)."'";
|
||||
|
||||
dolibarr_syslog("AdherentOptions::create_label sql=".$sql);
|
||||
if ($this->db->query($sql))
|
||||
{
|
||||
return 1;
|
||||
@ -203,7 +202,7 @@ class AdherentOptions
|
||||
|
||||
function delete($attrname)
|
||||
{
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-]*$/",$attrname)){
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname)){
|
||||
$sql = "ALTER TABLE ".MAIN_DB_PREFIX."adherent_options DROP COLUMN $attrname";
|
||||
|
||||
if ( $this->db->query( $sql) )
|
||||
@ -228,7 +227,7 @@ class AdherentOptions
|
||||
|
||||
function delete_label($attrname)
|
||||
{
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-]*$/",$attrname)){
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname)){
|
||||
$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_options_label WHERE name='$attrname'";
|
||||
|
||||
if ( $this->db->query( $sql) )
|
||||
@ -255,7 +254,7 @@ class AdherentOptions
|
||||
|
||||
function update($attrname,$type='varchar',$length=255)
|
||||
{
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-]*$/",$attrname)){
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname)){
|
||||
$sql = "ALTER TABLE ".MAIN_DB_PREFIX."adherent_options ";
|
||||
switch ($type){
|
||||
case 'varchar' :
|
||||
@ -296,13 +295,12 @@ class AdherentOptions
|
||||
|
||||
function update_label($attrname,$label='')
|
||||
{
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-]*$/",$attrname)){
|
||||
$escaped_label=mysql_escape_string($label);
|
||||
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname)){
|
||||
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."adherent_options_label WHERE name =
|
||||
'$attrname';";
|
||||
$this->db->query($sql_del);
|
||||
$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_options_label (name,label)
|
||||
VALUES ('$attrname','$escaped_label');";
|
||||
VALUES ('$attrname','".addslashes($escaped_label)."')";
|
||||
//$sql = "REPLACE INTO ".MAIN_DB_PREFIX."adherent_options_label SET name='$attrname',label='$escaped_label'";
|
||||
|
||||
if ( $this->db->query( $sql) )
|
||||
|
||||
@ -16,15 +16,12 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*/
|
||||
|
||||
/** \file htdocs/adherents/options.php
|
||||
\ingroup adherent
|
||||
\brief Page de configuratin des champs optionnels
|
||||
\version $Revision$
|
||||
\version $Id$
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
@ -35,43 +32,74 @@ $langs->load("members");
|
||||
$adho = new AdherentOptions($db);
|
||||
$form = new Form($db);
|
||||
|
||||
if ($_POST["action"] == 'add' && $user->admin)
|
||||
if ($_POST["action"] == 'add' && $user->rights->adherent->configurer)
|
||||
{
|
||||
if ($_POST["button"] != $langs->trans("Cancel"))
|
||||
{
|
||||
if ($_POST["button"] != $langs->trans("Cancel")) {
|
||||
// Type et taille non encore pris en compte => varchar(255)
|
||||
if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-]*$/",$_POST['attrname'])){
|
||||
if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
|
||||
{
|
||||
$adho->create($_POST['attrname'],$_POST['type'],$_POST['size']);
|
||||
}
|
||||
if (isset($_POST['label'])){
|
||||
if (isset($_POST['label']))
|
||||
{
|
||||
$adho->create_label($_POST['attrname'],$_POST['label']);
|
||||
}
|
||||
}
|
||||
Header("Location: ".$_SERVER["PHP_SELF"]);
|
||||
exit;
|
||||
}
|
||||
else
|
||||
{
|
||||
$langs->load("errors");
|
||||
$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
|
||||
$_GET["action"] = 'create';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($_POST["action"] == 'update' && $user->admin)
|
||||
if ($_POST["action"] == 'update' && $user->rights->adherent->configurer)
|
||||
{
|
||||
if ($_POST["button"] != $langs->trans("Cancel"))
|
||||
{
|
||||
if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
|
||||
{
|
||||
if ($_POST["button"] != $langs->trans("Cancel")) {
|
||||
if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-]*$/",$_POST['attrname'])){
|
||||
$adho->update($_POST['attrname'],$_POST['type'],$_POST['size']);
|
||||
}
|
||||
if (isset($_POST['label'])){
|
||||
if (isset($_POST['label']))
|
||||
{
|
||||
$adho->update_label($_POST['attrname'],$_POST['label']);
|
||||
}
|
||||
}
|
||||
Header("Location: ".$_SERVER["PHP_SELF"]);
|
||||
exit;
|
||||
}
|
||||
else
|
||||
{
|
||||
$langs->load("errors");
|
||||
$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Suppression attribut
|
||||
if ($_GET["action"] == 'delete' && $user->admin)
|
||||
if ($_GET["action"] == 'delete' && $user->rights->adherent->configurer)
|
||||
{
|
||||
if(isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_GET["attrname"]))
|
||||
{
|
||||
if(isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-]*$/",$_GET["attrname"])){
|
||||
$adho->delete($_GET["attrname"]);
|
||||
}
|
||||
Header("Location: ".$_SERVER["PHP_SELF"]);
|
||||
exit;
|
||||
}
|
||||
else
|
||||
{
|
||||
$langs->load("errors");
|
||||
$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
llxHeader();
|
||||
|
||||
|
||||
@ -79,11 +107,7 @@ llxHeader();
|
||||
print_titre($langs->trans("OptionalFieldsSetup"));
|
||||
print '<br>';
|
||||
|
||||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
if ($mesg) print '<div class="error">'.$mesg.'</div><br>';
|
||||
|
||||
$array_options=$adho->fetch_name_optionals();
|
||||
$array_label=$adho->fetch_name_optionals_label();
|
||||
|
||||
@ -28,3 +28,4 @@ ErrorGenbarCodeNotfound=File not found (Bad path, wrong permissions or access de
|
||||
ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
|
||||
ErrorDirAlreadyExists=A directory with this name already exists.
|
||||
WarningAllowUrlFopenMustBeOn=Parameter <b>allow_url_fopen</b> must be set to <b>on</b> in filer <b>php.ini</b> for having this module working completely. You must modify this file manually.
|
||||
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
|
||||
@ -28,3 +28,4 @@ ErrorGenbarCodeNotfound=Fichier introuvable (Mauvais chemin, permissions incorre
|
||||
ErrorFunctionNotAvailableInPHP=La fonction <b>%s</b> est requise pour cette fonctionnalité mais n'est pas disponible dans cette version/installation de PHP.
|
||||
ErrorDirAlreadyExists=Un répertoire portant ce nom existe déjà.
|
||||
WarningAllowUrlFopenMustBeOn=Attention, le paramètre <b>allow_url_fopen</b> doit etre positionné à <b>on</b> dans le fichier <b>php.ini</b> pour que ce module soit pleinement opérationnel. Vous devez modifier ce fichier manuellement.
|
||||
ErrorFieldCanNotContainSpecialCharacters=Le champ <b>%s</b> ne peut contenir de caractères spéciaux.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user