Skip to content

Commit

Permalink
Qual: Tous les répertoires qui servent à générer des données temporai…
Browse files Browse the repository at this point in the history 
…res (graph, fichiers rapports) sont nommés "nomdumodule/temp" pour plus de clarté et permettre fonction de nettoyage plus tard.
  • Loading branch information
@eldy
eldy committed Aug 19, 2006
1 parent f7c20fb commit 1e06a25
Show file tree
Hide file tree
Showing 31 changed files with 128 additions and 106 deletions.
2 changes: 1 addition & 1 deletion htdocs/comm/action/document.php
View file
Expand Up @@ -41,7 +41,7 @@
$langs->load("bills");

if (isset($_GET["error"])) $error=$_GET["error"];
$upload_dir = $conf->actionscomm->dir_output.'/'.$_GET['id'];
$upload_dir = $conf->actions->dir_output.'/'.$_GET['id'];

// Sécurité accés client
if ($user->societe_id > 0)
Expand Down
4 changes: 2 additions & 2 deletions htdocs/comm/action/rapport/index.php
View file
Expand Up @@ -115,9 +115,9 @@

print '<td><a href="index.php?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_file_new().'</a></td>';

$name = "rapport-action-".$obj->month."-".$obj->year.".pdf";
$name = "actions-".$obj->month."-".$obj->year.".pdf";
$relativepath= $name;
$file = $conf->commercial->dir_output . "/actions/" .$name;
$file = $conf->action->dir_temp."/".$name;

if (file_exists($file))
{
Expand Down
4 changes: 2 additions & 2 deletions htdocs/comm/action/rapport/rapport.pdf.php
View file
Expand Up @@ -68,8 +68,8 @@ function generate($socid = 0, $catid = 0)
{
global $user,$conf,$langs;

$dir = $conf->commercial->dir_output."/actions";
$file = $dir . "/rapport-action-".$this->month."-".$this->year.".pdf";
$dir = $conf->action->dir_temp."/";
$file = $dir . "/actions-".$this->month."-".$this->year.".pdf";

if (! file_exists($dir))
{
Expand Down
1 change: 1 addition & 0 deletions htdocs/comm/mailing/pre.inc.php
View file
Expand Up @@ -33,6 +33,7 @@
$user->getrights();
$langs->load("companies");
$langs->load("mails");
$langs->load("exports");


function llxHeader($head = "", $title = "")
Expand Down
6 changes: 3 additions & 3 deletions htdocs/comm/propal/stats/index.php
View file
Expand Up @@ -43,16 +43,16 @@
$year = strftime("%Y", time());
$data = $stats->getNbByMonthWithPrevYear($year);

create_exdir($conf->propal->dir_images);
create_exdir($conf->propal->dir_temp);

if (!$user->rights->commercial->client->voir || $user->societe_id)
{
$filename = $conf->propal->dir_images.'/nbpropale2year-'.$user->id.'-'.$year.'.png';
$filename = $conf->propal->dir_temp.'/nbpropale2year-'.$user->id.'-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=nbpropale2year-'.$user->id.'-'.$year.'.png';
}
else
{
$filename = $conf->propal->dir_images.'/nbpropale2year-'.$year.'.png';
$filename = $conf->propal->dir_temp.'/nbpropale2year-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=nbpropale2year-'.$year.'.png';
}

Expand Down
14 changes: 7 additions & 7 deletions htdocs/comm/propal/stats/month.php
View file
Expand Up @@ -53,16 +53,16 @@
$stats = new PropaleStats($db);
$data = $stats->getNbByMonth($year);

if (! is_dir($conf->propal->dir_images)) { mkdir($conf->propal->dir_images); }
create_exdir($conf->propal->dir_temp);

if (!$user->rights->commercial->client->voir || $user->societe_id)
{
$filename = $conf->propal->dir_images.'/propale-'.$user->id.'-'.$year.'.png';
$filename = $conf->propal->dir_temp.'/propale-'.$user->id.'-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propale-'.$user->id.'-'.$year.'.png';
}
else
{
$filename = $conf->propal->dir_images.'/propale'.$year.'.png';
$filename = $conf->propal->dir_temp.'/propale'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propale'.$year.'.png';
}

Expand Down Expand Up @@ -92,12 +92,12 @@

if (!$user->rights->commercial->client->voir || $user->societe_id)
{
$filename_amount = $conf->propal->dir_images.'/propaleamount-'.$user->id.'-'.$year.'.png';
$filename_amount = $conf->propal->dir_temp.'/propaleamount-'.$user->id.'-'.$year.'.png';
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propaleamount-'.$user->id.'-'.$year.'.png';
}
else
{
$filename_amount = $conf->propal->dir_images.'/propaleamount'.$year.'.png';
$filename_amount = $conf->propal->dir_temp.'/propaleamount'.$year.'.png';
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propaleamount'.$year.'.png';
}

Expand Down Expand Up @@ -127,12 +127,12 @@

if (!$user->rights->commercial->client->voir || $user->societe_id)
{
$filename_avg = $conf->propal->dir_images.'/propaleaverage-'.$user->id.'-'.$year.'.png';
$filename_avg = $conf->propal->dir_temp.'/propaleaverage-'.$user->id.'-'.$year.'.png';
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propaleaverage-'.$user->id.'-'.$year.'.png';
}
else
{
$filename_avg = $conf->propal->dir_images.'/propaleaverage'.$year.'.png';
$filename_avg = $conf->propal->dir_temp.'/propaleaverage'.$year.'.png';
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propaleaverage'.$year.'.png';
}

Expand Down
6 changes: 3 additions & 3 deletions htdocs/commande/stats/index.php
View file
Expand Up @@ -55,7 +55,7 @@
$data = $stats->getNbByMonthWithPrevYear($year);

// Création répertoire pour images générées
$dir=$conf->commande->dir_images;
$dir=$conf->commande->dir_temp;
if (! file_exists($dir))
{
if (create_exdir($dir) < 0)
Expand All @@ -66,12 +66,12 @@

if (!$user->rights->commercial->client->voir || $user->societe_id)
{
$filename = $conf->commande->dir_images.'/nbcommande2year-'.$user->id.'-'.$year.'.png';
$filename = $conf->commande->dir_temp.'/nbcommande2year-'.$user->id.'-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=nbcommande2year-'.$user->id.'-'.$year.'.png';
}
else
{
$filename = $conf->commande->dir_images.'/nbcommande2year-'.$year.'.png';
$filename = $conf->commande->dir_temp.'/nbcommande2year-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=nbcommande2year-'.$year.'.png';
}

Expand Down
15 changes: 8 additions & 7 deletions htdocs/commande/stats/month.php
View file
Expand Up @@ -60,16 +60,17 @@
$stats = new CommandeStats($db, $socidp);
$data = $stats->getNbByMonth($year);

if (! is_dir($conf->commande->dir_images)) { mkdir($conf->commande->dir_images); }
create_exdir($conf->commande->dir_temp);


if (!$user->rights->commercial->client->voir || $user->societe_id)
{
$filename = $conf->commande->dir_images.'/commande-'.$user->id.'-'.$year.'.png';
$filename = $conf->commande->dir_temp.'/commande-'.$user->id.'-'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commande-'.$user->id.'-'.$year.'.png';
}
else
{
$filename = $conf->commande->dir_images.'/commande'.$year.'.png';
$filename = $conf->commande->dir_temp.'/commande'.$year.'.png';
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commande'.$year.'.png';
}

Expand Down Expand Up @@ -99,12 +100,12 @@

if (!$user->rights->commercial->client->voir || $user->societe_id)
{
$filename_amount = $conf->commande->dir_images.'/commandeamount-'.$user->id.'-'.$year.'.png';
$filename_amount = $conf->commande->dir_temp.'/commandeamount-'.$user->id.'-'.$year.'.png';
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commandeamount-'.$user->id.'-'.$year.'.png';
}
else
{
$filename_amount = $conf->commande->dir_images.'/commandeamount'.$year.'.png';
$filename_amount = $conf->commande->dir_temp.'/commandeamount'.$year.'.png';
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commandeamount'.$year.'.png';
}

Expand Down Expand Up @@ -133,12 +134,12 @@

if (!$user->rights->commercial->client->voir || $user->societe_id)
{
$filename_avg = $conf->commande->dir_images.'/commandeaverage-'.$user->id.'-'.$year.'.png';
$filename_avg = $conf->commande->dir_temp.'/commandeaverage-'.$user->id.'-'.$year.'.png';
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commandeaverage-'.$user->id.'-'.$year.'.png';
}
else
{
$filename_avg = $conf->commande->dir_images.'/commandeaverage'.$year.'.png';
$filename_avg = $conf->commande->dir_temp.'/commandeaverage'.$year.'.png';
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=commandeaverage'.$year.'.png';
}

Expand Down
10 changes: 5 additions & 5 deletions htdocs/compta/bank/graph.php
View file
Expand Up @@ -51,7 +51,7 @@
$acct->fetch($account);


create_exdir($conf->banque->dir_images);
create_exdir($conf->banque->dir_temp);


// Definition de $width et $height
Expand Down Expand Up @@ -146,7 +146,7 @@
}

// Fabrication tableau 1
$file= $conf->banque->dir_images."/solde.$account.$year.$month.png";
$file= $conf->banque->dir_temp."/solde.$account.$year.$month.png";
$title=$langs->trans("Balance").' '.$langs->trans("Month").': '.$month.' '.$langs->trans("Year").': '.$year;
$graph_datas=array();
foreach($datas as $i => $val)
Expand Down Expand Up @@ -240,7 +240,7 @@
}

// Fabrication tableau 2
$file= $conf->banque->dir_images."/solde.$account.$year.png";
$file= $conf->banque->dir_temp."/solde.$account.$year.png";
$title=$langs->trans("Balance").' '.$langs->trans("Year").': '.$year;
$graph_datas=array();
foreach($datas as $i => $val)
Expand Down Expand Up @@ -317,7 +317,7 @@
}

// Fabrication tableau 3
$file= $conf->banque->dir_images."/solde.$account.png";
$file= $conf->banque->dir_temp."/solde.$account.png";
$title=$langs->trans("Balance");
$graph_datas=array();
foreach($datas as $i => $val)
Expand Down Expand Up @@ -394,7 +394,7 @@
}

// Fabrication tableau 4
$file= $conf->banque->dir_images."/mouvement.$account.$year.png";
$file= $conf->banque->dir_temp."/mouvement.$account.$year.png";
$title=$langs->trans("Movements").' '.$langs->trans("Year").': '.$year;
$graph_datas=array();
foreach($data_credit as $i => $val)
Expand Down
4 changes: 2 additions & 2 deletions htdocs/compta/facture/stats/index.php
View file
Expand Up @@ -48,9 +48,9 @@
$year = strftime("%Y", time());
$data = $stats->getNbByMonthWithPrevYear($year);

if (! is_dir($conf->facture->dir_images)) { mkdir($conf->facture->dir_images); }
create_exdir($conf->facture->dir_temp);

$filename = $conf->facture->dir_images."/nbfacture2year-".$year.".png";
$filename = $conf->facture->dir_temp."/nbfacture2year-".$year.".png";
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=nbfacture2year-'.$year.'.png';

$px = new DolGraph();
Expand Down
8 changes: 4 additions & 4 deletions htdocs/compta/facture/stats/month.php
View file
Expand Up @@ -54,9 +54,9 @@
$stats = new FactureStats($db, $socidp);
$data = $stats->getNbByMonth($year);

if (! is_dir($conf->facture->dir_images)) { mkdir($conf->facture->dir_images); }
create_exdir($conf->facture->dir_temp);

$filename = $conf->facture->dir_images."/facture".$year.".png";
$filename = $conf->facture->dir_temp."/facture".$year.".png";
$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=facture'.$year.'.png';

$px = new DolGraph();
Expand All @@ -83,7 +83,7 @@
$data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]);
}

$filename_amount = $conf->facture->dir_images."/factureamount".$year.".png";
$filename_amount = $conf->facture->dir_temp."/factureamount".$year.".png";
$fileurl_amount = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=factureamount'.$year.'.png';

$px = new DolGraph();
Expand All @@ -110,7 +110,7 @@
$data[$i-1] = array(ucfirst(substr(strftime("%b",mktime(12,12,12,$i,1,$year)),0,3)), $res[$i]);
}

$filename_avg = $conf->facture->dir_images."/factureaverage".$year.".png";
$filename_avg = $conf->facture->dir_temp."/factureaverage".$year.".png";
$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&file=factureaverage'.$year.'.png';

$px = new DolGraph();
Expand Down

0 comments on commit 1e06a25

Please sign in to comment.