Format correctly code

This commit is contained in:
Laurent Destailleur 2009-04-29 20:16:13 +00:00
parent f8f061780b
commit a7ba3bf3cb

View File

@ -100,309 +100,309 @@ $accessallowed=0;
$sqlprotectagainstexternals=''; $sqlprotectagainstexternals='';
if ($modulepart) if ($modulepart)
{ {
// On fait une verification des droits et on definit le repertoire concerne // On fait une verification des droits et on definit le repertoire concerne
// Wrapping pour les factures // Wrapping pour les factures
if ($modulepart == 'facture') if ($modulepart == 'facture')
{ {
$user->getrights('facture'); $user->getrights('facture');
if ($user->rights->facture->lire || eregi('^specimen',$original_file)) if ($user->rights->facture->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->facture->dir_output.'/'.$original_file; $original_file=$conf->facture->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='$refname'"; $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='$refname'";
} }
if ($modulepart == 'unpayed') if ($modulepart == 'unpayed')
{ {
$user->getrights('facture'); $user->getrights('facture');
if ($user->rights->facture->lire || eregi('^specimen',$original_file)) if ($user->rights->facture->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->facture->dir_output.'/unpayed/temp/'.$original_file; $original_file=$conf->facture->dir_output.'/unpayed/temp/'.$original_file;
} }
// Wrapping pour les fiches intervention // Wrapping pour les fiches intervention
if ($modulepart == 'ficheinter') if ($modulepart == 'ficheinter')
{ {
$user->getrights('ficheinter'); $user->getrights('ficheinter');
if ($user->rights->ficheinter->lire || eregi('^specimen',$original_file)) if ($user->rights->ficheinter->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->ficheinter->dir_output.'/'.$original_file; $original_file=$conf->ficheinter->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'"; $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
} }
// Wrapping pour les prelevements // Wrapping pour les prelevements
if ($modulepart == 'prelevement') if ($modulepart == 'prelevement')
{ {
$user->getrights('prelevement'); $user->getrights('prelevement');
if ($user->rights->prelevement->bons->lire || eregi('^specimen',$original_file)) if ($user->rights->prelevement->bons->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->prelevement->dir_output.'/'.$original_file; $original_file=$conf->prelevement->dir_output.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."$modulepart WHERE ref='$refname'"; //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."$modulepart WHERE ref='$refname'";
} }
// Wrapping pour les propales // Wrapping pour les propales
if ($modulepart == 'propal') if ($modulepart == 'propal')
{ {
$user->getrights('propale'); $user->getrights('propale');
if ($user->rights->propale->lire || eregi('^specimen',$original_file)) if ($user->rights->propale->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->propale->dir_output.'/'.$original_file; $original_file=$conf->propale->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='$refname'"; $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='$refname'";
} }
// Wrapping pour les commandes // Wrapping pour les commandes
if ($modulepart == 'commande') if ($modulepart == 'commande')
{ {
$user->getrights('commande'); $user->getrights('commande');
if ($user->rights->commande->lire || eregi('^specimen',$original_file)) if ($user->rights->commande->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->commande->dir_output.'/'.$original_file; $original_file=$conf->commande->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='$refname'"; $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='$refname'";
} }
// Wrapping pour les commandes fournisseurs // Wrapping pour les commandes fournisseurs
if ($modulepart == 'commande_fournisseur') if ($modulepart == 'commande_fournisseur')
{ {
$user->getrights('fournisseur'); $user->getrights('fournisseur');
if ($user->rights->fournisseur->commande->lire || eregi('^specimen',$original_file)) if ($user->rights->fournisseur->commande->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->fournisseur->dir_commande.'/'.$original_file; $original_file=$conf->fournisseur->dir_commande.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='$refname'"; $sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='$refname'";
} }
// Wrapping pour les factures fournisseurs // Wrapping pour les factures fournisseurs
if ($modulepart == 'facture_fournisseur') if ($modulepart == 'facture_fournisseur')
{ {
$user->getrights('fournisseur'); $user->getrights('fournisseur');
if ($user->rights->fournisseur->facture->lire || eregi('^specimen',$original_file)) if ($user->rights->fournisseur->facture->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->fournisseur->dir_facture.'/'.$original_file; $original_file=$conf->fournisseur->dir_facture.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='$refname'"; //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE facnumber='$refname'";
} }
// Wrapping pour les rapport de paiements // Wrapping pour les rapport de paiements
if ($modulepart == 'facture_paiement') if ($modulepart == 'facture_paiement')
{ {
$user->getrights('facture'); $user->getrights('facture');
if ($user->rights->facture->lire || eregi('^specimen',$original_file)) if ($user->rights->facture->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
if ($user->societe_id > 0) $original_file=DOL_DATA_ROOT.'/private/'.$user->id.'/compta/'.$original_file; if ($user->societe_id > 0) $original_file=DOL_DATA_ROOT.'/private/'.$user->id.'/compta/'.$original_file;
else $original_file=$conf->compta->dir_output.'/payments/'.$original_file; else $original_file=$conf->compta->dir_output.'/payments/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour les exports de compta
if ($modulepart == 'export_compta')
{
$user->getrights('compta');
if ($user->rights->compta->ventilation->creer || eregi('^specimen',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->compta->dir_output.'/'.$original_file;
}
// Wrapping pour les societe
if ($modulepart == 'societe')
{
$user->getrights('societe');
if ($user->rights->societe->lire || eregi('^specimen',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->societe->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE idp='$refname'";
}
// Wrapping pour les expedition
if ($modulepart == 'expedition')
{
$user->getrights('expedition');
if ($user->rights->expedition->lire || eregi('^specimen',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->expedition->dir_bon_expedition.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour les bons de livraison
if ($modulepart == 'livraison')
{
$user->getrights('expedition');
if ($user->rights->expedition->livraison->lire || eregi('^specimen',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->expedition->dir_bon_livraison.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'"; //$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
} }
// Wrapping pour la telephonie // Wrapping pour les exports de compta
if ($modulepart == 'telephonie') if ($modulepart == 'export_compta')
{ {
$user->getrights('telephonie'); $user->getrights('compta');
if ($user->rights->telephonie->lire || eregi('^specimen',$original_file)) if ($user->rights->compta->ventilation->creer || eregi('^specimen',$original_file))
{ {
$accessallowed=1;
}
$original_file=$conf->telephonie->dir_output.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour les actions
if ($modulepart == 'actions')
{
$user->getrights('commercial');
//if ($user->rights->commercial->actions->lire || eregi('^specimen',$original_file)) // TODO: revoir les droits car pas clair
//{
$accessallowed=1;
//}
$original_file=$conf->commercial->dir_actions.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour les actions
if ($modulepart == 'actionsreport')
{
$user->getrights('commercial');
//if ($user->rights->commercial->actions->lire || eregi('^specimen',$original_file)) // TODO: revoir les droits car pas clair
//{
$accessallowed=1;
//}
$original_file = $conf->commercial->dir_actions_temp."/".$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour les produits et services
if ($modulepart == 'produit')
{
$user->getrights('produit');
if ($user->rights->produit->lire || eregi('^specimen',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->produit->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = '';
}
// Wrapping pour les produits et services
if ($modulepart == 'contract')
{
$user->getrights('contrat');
if ($user->rights->contrat->lire || eregi('^specimen',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->contrat->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = '';
}
// Wrapping pour les documents generaux
if ($modulepart == 'ged')
{
$user->getrights('document');
if ($user->rights->document->lire)
{
$accessallowed=1; $accessallowed=1;
} }
$original_file= $this->ged->dir_output.'/'.$original_file; $original_file=$conf->compta->dir_output.'/'.$original_file;
} }
// Wrapping pour les documents generaux // Wrapping pour les societe
if ($modulepart == 'ecm') if ($modulepart == 'societe')
{ {
$user->getrights('ecm'); $user->getrights('societe');
if ($user->rights->ecm->download) if ($user->rights->societe->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file= $this->ecm->dir_output.'/'.$original_file; $original_file=$conf->societe->dir_output.'/'.$original_file;
} $sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE idp='$refname'";
}
// Wrapping pour les dons // Wrapping pour les expedition
if ($modulepart == 'donation') if ($modulepart == 'expedition')
{ {
$user->getrights('don'); $user->getrights('expedition');
if ($user->rights->don->lire || eregi('^specimen',$original_file)) if ($user->rights->expedition->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->don->dir_output.'/'.$original_file; $original_file=$conf->expedition->dir_bon_expedition.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour les bons de livraison
if ($modulepart == 'livraison')
{
$user->getrights('expedition');
if ($user->rights->expedition->livraison->lire || eregi('^specimen',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->expedition->dir_bon_livraison.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour la telephonie
if ($modulepart == 'telephonie')
{
$user->getrights('telephonie');
if ($user->rights->telephonie->lire || eregi('^specimen',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->telephonie->dir_output.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour les actions
if ($modulepart == 'actions')
{
$user->getrights('commercial');
//if ($user->rights->commercial->actions->lire || eregi('^specimen',$original_file)) // TODO: revoir les droits car pas clair
//{
$accessallowed=1;
//}
$original_file=$conf->commercial->dir_actions.'/'.$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour les actions
if ($modulepart == 'actionsreport')
{
$user->getrights('commercial');
//if ($user->rights->commercial->actions->lire || eregi('^specimen',$original_file)) // TODO: revoir les droits car pas clair
//{
$accessallowed=1;
//}
$original_file = $conf->commercial->dir_actions_temp."/".$original_file;
//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='$refname'";
}
// Wrapping pour les produits et services
if ($modulepart == 'produit')
{
$user->getrights('produit');
if ($user->rights->produit->lire || eregi('^specimen',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->produit->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = ''; $sqlprotectagainstexternals = '';
} }
// Wrapping pour les remises de cheques // Wrapping pour les contrats
if ($modulepart == 'remisecheque') if ($modulepart == 'contract')
{ {
$user->getrights('banque'); $user->getrights('contrat');
if ($user->rights->banque || eregi('^specimen',$original_file)) if ($user->rights->contrat->lire || eregi('^specimen',$original_file))
{ {
$accessallowed=1; $accessallowed=1;
} }
$original_file=$conf->contrat->dir_output.'/'.$original_file;
$original_file=DOL_DATA_ROOT.'/compta/bordereau/'.get_exdir(basename($original_file,".pdf")).$original_file;
$sqlprotectagainstexternals = ''; $sqlprotectagainstexternals = '';
} }
// Wrapping pour les exports // Wrapping pour les documents generaux
if ($modulepart == 'export') if ($modulepart == 'ged')
{ {
// Aucun test necessaire car on force le rep de doanwload sur $user->getrights('document');
// le rep export qui est propre a l'utilisateur if ($user->rights->document->lire)
$accessallowed=1; {
$original_file=$conf->export->dir_temp.'/'.$user->id.'/'.$original_file; $accessallowed=1;
$sqlprotectagainstexternals = ''; }
} $original_file= $this->ged->dir_output.'/'.$original_file;
}
// Wrapping pour l'editeur wysiwyg // Wrapping pour les documents generaux
if ($modulepart == 'editor') if ($modulepart == 'ecm')
{ {
// Aucun test necessaire car on force le rep de download sur $user->getrights('ecm');
// le rep export qui est propre a l'utilisateur if ($user->rights->ecm->download)
$accessallowed=1; {
$original_file=$conf->fckeditor->dir_output.'/'.$original_file; $accessallowed=1;
$sqlprotectagainstexternals = ''; }
} $original_file= $this->ecm->dir_output.'/'.$original_file;
}
// Wrapping pour les backups // Wrapping pour les dons
if ($modulepart == 'systemtools') if ($modulepart == 'donation')
{ {
if ($user->admin) $user->getrights('don');
{ if ($user->rights->don->lire || eregi('^specimen',$original_file))
$accessallowed=1; {
} $accessallowed=1;
$original_file=$conf->admin->dir_temp.'/'.$original_file; }
$original_file=$conf->don->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = ''; $sqlprotectagainstexternals = '';
} }
// Wrapping pour BitTorrent // Wrapping pour les remises de cheques
if ($modulepart == 'bittorrent') if ($modulepart == 'remisecheque')
{ {
$accessallowed=1; $user->getrights('banque');
$dir='files'; if ($user->rights->banque || eregi('^specimen',$original_file))
if ($type == 'application/x-bittorrent') $dir='torrents'; {
$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file; $accessallowed=1;
}
$original_file=DOL_DATA_ROOT.'/compta/bordereau/'.get_exdir(basename($original_file,".pdf")).$original_file;
$sqlprotectagainstexternals = ''; $sqlprotectagainstexternals = '';
} }
// Wrapping pour les exports
if ($modulepart == 'export')
{
// Aucun test necessaire car on force le rep de doanwload sur
// le rep export qui est propre a l'utilisateur
$accessallowed=1;
$original_file=$conf->export->dir_temp.'/'.$user->id.'/'.$original_file;
$sqlprotectagainstexternals = '';
}
// Wrapping pour l'editeur wysiwyg
if ($modulepart == 'editor')
{
// Aucun test necessaire car on force le rep de download sur
// le rep export qui est propre a l'utilisateur
$accessallowed=1;
$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = '';
}
// Wrapping pour les backups
if ($modulepart == 'systemtools')
{
if ($user->admin)
{
$accessallowed=1;
}
$original_file=$conf->admin->dir_temp.'/'.$original_file;
$sqlprotectagainstexternals = '';
}
// Wrapping pour BitTorrent
if ($modulepart == 'bittorrent')
{
$accessallowed=1;
$dir='files';
if ($type == 'application/x-bittorrent') $dir='torrents';
$original_file=$conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
$sqlprotectagainstexternals = '';
}
} }
// Basic protection (against external users only) // Basic protection (against external users only)
@ -413,10 +413,10 @@ if ($user->societe_id > 0)
$resql = $db->query($sqlprotectagainstexternals); $resql = $db->query($sqlprotectagainstexternals);
if ($resql) if ($resql)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$num=$db->num_rows($resql); $num=$db->num_rows($resql);
if ($num>0 && $user->societe_id != $obj->fk_soc) if ($num>0 && $user->societe_id != $obj->fk_soc)
$accessallowed=0; $accessallowed=0;
} }
} }
} }
@ -425,7 +425,7 @@ if ($user->societe_id > 0)
// Limite acces si droits non corrects // Limite acces si droits non corrects
if (! $accessallowed) if (! $accessallowed)
{ {
accessforbidden(); accessforbidden();
} }
// Security: // Security:
@ -453,8 +453,8 @@ if ($action == 'remove_file')
if (! file_exists($original_file)) if (! file_exists($original_file))
{ {
dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$_GET["file"])); dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$_GET["file"]));
exit; exit;
} }
unlink($original_file); unlink($original_file);
@ -476,8 +476,8 @@ else
if (! file_exists($original_file)) if (! file_exists($original_file))
{ {
dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file)); dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
exit; exit;
} }