Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Accept _ in attribut type name. Better error management.

Browse Source
This commit is contained in:
Laurent Destailleur 2008-05-31 22:08:59 +00:00
parent 8246e1de5c
commit 2b084e56bd
4 changed files with 326 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

546
htdocs/adherents/adherent_options.class.php
View File

@ -24,372 +24,370 @@
*/
/*! \file htdocs/adherents/adherent_options.class.php
\ingroup adherent
\brief Fichier de la classe de gestion de la table des champs optionels adhérents
\author Rodolphe Quiedville
\author Jean-Louis Bergamo
\author Sebastien Di Cintio
\author Benoit Mortier
\version $Revision$
*/
\ingroup adherent
\brief Fichier de la classe de gestion de la table des champs optionels adhérents
\author Rodolphe Quiedville
\author Jean-Louis Bergamo
\author Sebastien Di Cintio
\author Benoit Mortier
\version $Revision$
*/
/*! \class AdherentOptions
\brief Classe de gestion de la table des champs optionels adhérents
*/
\brief Classe de gestion de la table des champs optionels adhérents
*/
class AdherentOptions
{
var $id;
var $db;
/*
* Tableau contenant le nom des champs en clef et la definition de
* ces champs
*/
var $attribute_name;
/*
* Tableau contenant le nom des champs en clef et le label de ces
* champs en value
*/
var $attribute_label;
var $id;
var $db;
/*
* Tableau contenant le nom des champs en clef et la definition de
* ces champs
*/
var $attribute_name;
/*
* Tableau contenant le nom des champs en clef et le label de ces
* champs en value
*/
var $attribute_label;
var $error;
/*
* Constructor
*
*/
var $error;
/*
* Constructor
*
*/
/*!
/*!
\brief AdherentOptions
\param DB base de données
\param id id de l'adhérent
*/
*/
function AdherentOptions($DB, $id='')
{
$this->db = $DB ;
$this->id = $id;
$this->error = array();
$this->attribute_name = array();
$this->attribute_label = array();
}
function AdherentOptions($DB, $id='')
{
$this->db = $DB ;
$this->id = $id;
$this->error = array();
$this->attribute_name = array();
$this->attribute_label = array();
}
/*!
/*!
\brief fonction qui imprime un liste d'erreurs
*/
function print_error_list()
{
$num = sizeof($this->error);
for ($i = 0 ; $i < $num ; $i++)
{
print "<li>" . $this->error[$i];
}
}
*/
function print_error_list()
{
$num = sizeof($this->error);
for ($i = 0 ; $i < $num ; $i++)
{
print "<li>" . $this->error[$i];
}
}
/*!
/*!
\brief fonction qui vérifie les données entrées
\param minimum
*/
*/
function check($minimum=0)
{
$err = 0;
if (strlen(trim($this->societe)) == 0)
{
$err = 0;
if (strlen(trim($this->societe)) == 0)
{
if ((strlen(trim($this->nom)) + strlen(trim($this->prenom))) == 0)
{
$error_string[$err] = "Vous devez saisir vos nom et prénom ou le nom de votre société.";
$err++;
}
}
{
$error_string[$err] = "Vous devez saisir vos nom et prénom ou le nom de votre société.";
$err++;
}
}
if (strlen(trim($this->adresse)) == 0)
{
if (strlen(trim($this->adresse)) == 0)
{
$error_string[$err] = "L'adresse saisie est invalide";
$err++;
}
}
/*
* Return errors
*
*/
/*
* Return errors
*
*/
if ($err)
{
if ($err)
{
$this->error = $error_string;
return 0;
}
else
{
}
else
{
return 1;
}
}
}
/*!
/**
\brief fonction qui crée un attribut optionnel
\param attrname nom de l'atribut
\param type type de l'attribut
\param length longuer de l'attribut
\remarks Ceci correspond a une modification de la table et pas a un rajout d'enregistrement
*/
*/
function create($attrname,$type='varchar',$length=255) {
function create($attrname,$type='varchar',$length=255) {
/*
* Insertion dans la base
*/
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-]*$/",$attrname)){
$sql = "ALTER TABLE ".MAIN_DB_PREFIX."adherent_options ";
switch ($type){
case 'varchar' :
case 'interger' :
$sql .= " ADD $attrname $type($length)";
break;
case 'text' :
case 'date' :
case 'datetime' :
$sql .= " ADD $attrname $type";
break;
default:
$sql .= " ADD $attrname $type";
break;
}
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
{
$sql = "ALTER TABLE ".MAIN_DB_PREFIX."adherent_options ";
switch ($type){
case 'varchar' :
case 'interger' :
$sql .= " ADD $attrname $type($length)";
break;
case 'text' :
case 'date' :
case 'datetime' :
$sql .= " ADD $attrname $type";
break;
default:
$sql .= " ADD $attrname $type";
break;
}
if ($this->db->query($sql))
{
return 1;
dolibarr_syslog("AdherentOptions::create sql=".$sql);
if ($this->db->query($sql))
{
return 1;
}
else
{
dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
}
else
{
dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
}
/*!
/**
\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)) {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_options_label SET ";
$escaped_label=mysql_escape_string($label);
$sql .= " name='$attrname',label='$escaped_label' ";
if ($this->db->query($sql))
{
return 1;
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}
}
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='".addslashes($escaped_label)."'";
/*!
dolibarr_syslog("AdherentOptions::create_label sql=".$sql);
if ($this->db->query($sql))
{
return 1;
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}
}
/*!
\brief fonction qui supprime un attribut
\param attrname nom de l'atribut
*/
*/
function delete($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) )
function delete($attrname)
{
return $this->delete_label($attrname);
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
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) )
{
return $this->delete_label($attrname);
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
/*!
}
/*!
\brief fonction qui supprime un label
\param attrname nom du label
*/
*/
function delete_label($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) )
function delete_label($attrname)
{
return 1;
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
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) )
{
return 1;
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
/*!
}
/*!
\brief fonction qui modifie un attribut optionnel
\param attrname nom de l'atribut
\param type type de l'attribut
\param length longuer de l'attribut
*/
*/
function update($attrname,$type='varchar',$length=255)
{
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-]*$/",$attrname)){
$sql = "ALTER TABLE ".MAIN_DB_PREFIX."adherent_options ";
switch ($type){
case 'varchar' :
case 'interger' :
$sql .= " MODIFY COLUMN $attrname $type($length)";
break;
case 'text' :
case 'date' :
case 'datetime' :
$sql .= " MODIFY COLUMN $attrname $type";
break;
default:
$sql .= " MODIFY COLUMN $attrname $type";
break;
}
//$sql .= "MODIFY COLUMN $attrname $type($length)";
if ( $this->db->query( $sql) )
function update($attrname,$type='varchar',$length=255)
{
return 1;
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname)){
$sql = "ALTER TABLE ".MAIN_DB_PREFIX."adherent_options ";
switch ($type){
case 'varchar' :
case 'interger' :
$sql .= " MODIFY COLUMN $attrname $type($length)";
break;
case 'text' :
case 'date' :
case 'datetime' :
$sql .= " MODIFY COLUMN $attrname $type";
break;
default:
$sql .= " MODIFY COLUMN $attrname $type";
break;
}
//$sql .= "MODIFY COLUMN $attrname $type($length)";
}
if ( $this->db->query( $sql) )
{
return 1;
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
/*!
}
/*!
\brief fonction qui modifie un label
\param attrname nom de l'atribut
\param label nom du label
*/
*/
function update_label($attrname,$label='')
{
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-]*$/",$attrname)){
$escaped_label=mysql_escape_string($label);
function update_label($attrname,$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');";
//$sql = "REPLACE INTO ".MAIN_DB_PREFIX."adherent_options_label SET name='$attrname',label='$escaped_label'";
$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_options_label (name,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) )
{
return 1;
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
if ( $this->db->query( $sql) )
{
return 1;
}
else
{
print dolibarr_print_error($this->db);
return 0;
}
}else{
return 0;
}
}
/*!
/*!
\brief fonction qui modifie un label
*/
*/
function fetch_optionals()
{
$this->fetch_name_optionals();
$this->fetch_name_optionals_label();
}
{
$this->fetch_name_optionals();
$this->fetch_name_optionals_label();
}
/*!
/*!
\brief fonction qui modifie un label
*/
*/
function fetch_name_optionals()
{
$array_name_options=array();
$sql = "SHOW COLUMNS FROM ".MAIN_DB_PREFIX."adherent_options";
if ( $this->db->query( $sql) )
{
if ($this->db->num_rows())
{
while ($tab = $this->db->fetch_object())
{
if ($tab->Field != 'optid' && $tab->Field != 'tms' && $tab->Field != 'adhid')
$array_name_options=array();
$sql = "SHOW COLUMNS FROM ".MAIN_DB_PREFIX."adherent_options";
if ( $this->db->query( $sql) )
{
if ($this->db->num_rows())
{
while ($tab = $this->db->fetch_object())
{
if ($tab->Field != 'optid' && $tab->Field != 'tms' && $tab->Field != 'adhid')
{
// we can add this attribute to adherent object
$array_name_options[]=$tab->Field;
$this->attribute_name[$tab->Field]=$tab->Type;
// we can add this attribute to adherent object
$array_name_options[]=$tab->Field;
$this->attribute_name[$tab->Field]=$tab->Type;
}
}
return $array_name_options;
}else{
return array();
}
}else{
print $this->db->error();
return array() ;
}
}
return $array_name_options;
}else{
return array();
}
}else{
print $this->db->error();
return array() ;
}
}
}
/*!
/*!
\brief fonction qui modifie un label
*/
*/
function fetch_name_optionals_label()
{
$array_name_label=array();
$sql = "SELECT name,label FROM ".MAIN_DB_PREFIX."adherent_options_label";
if ( $this->db->query( $sql) )
{
if ($this->db->num_rows())
{
while ($tab = $this->db->fetch_object())
{
$array_name_label=array();
$sql = "SELECT name,label FROM ".MAIN_DB_PREFIX."adherent_options_label";
if ( $this->db->query( $sql) )
{
if ($this->db->num_rows())
{
while ($tab = $this->db->fetch_object())
{
// we can add this attribute to adherent object
$array_name_label[$tab->name]=stripslashes($tab->label);
$this->attribute_label[$tab->name]=stripslashes($tab->label);
}
return $array_name_label;
}else{
return array();
}
}else{
print dolibarr_print_error($this->db);
return array() ;
}
}
return $array_name_label;
}else{
return array();
}
}else{
print dolibarr_print_error($this->db);
return array() ;
}
}
}
}
?>

80
htdocs/adherents/options.php
View File

@ -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'])){
$adho->create($_POST['attrname'],$_POST['type'],$_POST['size']);
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']))
{
$adho->create_label($_POST['attrname'],$_POST['label']);
}
Header("Location: ".$_SERVER["PHP_SELF"]);
exit;
}
if (isset($_POST['label'])){
$adho->create_label($_POST['attrname'],$_POST['label']);
else
{
$langs->load("errors");
$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
$_GET["action"] = 'create';
}
}
Header("Location: ".$_SERVER["PHP_SELF"]);
}
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'])){
$adho->update($_POST['attrname'],$_POST['type'],$_POST['size']);
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']))
{
$adho->update_label($_POST['attrname'],$_POST['label']);
}
Header("Location: ".$_SERVER["PHP_SELF"]);
exit;
}
if (isset($_POST['label'])){
$adho->update_label($_POST['attrname'],$_POST['label']);
else
{
$langs->load("errors");
$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
}
}
Header("Location: ".$_SERVER["PHP_SELF"]);
}
# 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"])){
$adho->delete($_GET["attrname"]);
}
Header("Location: ".$_SERVER["PHP_SELF"]);
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();

1
htdocs/langs/en_US/errors.lang
View File

@ -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.

1
htdocs/langs/fr_FR/errors.lang
View File

@ -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.