--- /tmp/dsg/dolibarr/htdocs/ticket/stats/github_index.php
+++ /tmp/dsg/dolibarr/htdocs/ticket/stats/client_index.php
@@ -32,19 +32,19 @@
 

 if (!$user->rights->ticket->read) accessforbidden();

 

-$object_status = GETPOST('object_status', 'intcomma');

+$object_status = GETPOST('object_status');

 

 $userid = GETPOST('userid', 'int');

 $socid = GETPOST('socid', 'int');

 // Security check

 if ($user->socid > 0)

 {

-	$action = '';

-	$socid = $user->socid;

+    $action = '';

+    $socid = $user->socid;

 }

 

 $nowyear = strftime("%Y", dol_now());

-$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;

+$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;

 //$startyear=$year-2;

 $startyear = $year - 1;

 $endyear = $year;

@@ -70,7 +70,7 @@
 dol_mkdir($dir);

 

 $stats = new TicketStats($db, $socid, ($userid > 0 ? $userid : 0));

-if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';

+if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND fk_statut IN ('.$db->escape($object_status).')';

 

 

 // Build graphic number of object

@@ -82,36 +82,38 @@
 

 if (!$user->rights->societe->client->voir || $user->socid)

 {

-	$filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';

-	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';

-} else {

-	$filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';

-	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';

+    $filenamenb = $dir.'/ticketsnbinyear-'.$user->id.'-'.$year.'.png';

+    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$user->id.'-'.$year.'.png';

+}

+else

+{

+    $filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';

+    $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';

 }

 

 $px1 = new DolGraph();

 $mesg = $px1->isGraphKo();

 if (!$mesg)

 {

-	$px1->SetData($data);

-	$i = $startyear; $legend = array();

-	while ($i <= $endyear)

-	{

-		$legend[] = $i;

-		$i++;

-	}

-	$px1->SetLegend($legend);

-	$px1->SetMaxValue($px1->GetCeilMaxValue());

-	$px1->SetMinValue(min(0, $px1->GetFloorMinValue()));

-	$px1->SetWidth($WIDTH);

-	$px1->SetHeight($HEIGHT);

-	$px1->SetYLabel($langs->trans("NbOfTicket"));

-	$px1->SetShading(3);

-	$px1->SetHorizTickIncrement(1);

-	$px1->mode = 'depth';

-	$px1->SetTitle($langs->trans("NumberOfTicketsByMonth"));

-

-	$px1->draw($filenamenb, $fileurlnb);

+    $px1->SetData($data);

+    $i = $startyear; $legend = array();

+    while ($i <= $endyear)

+    {

+        $legend[] = $i;

+        $i++;

+    }

+    $px1->SetLegend($legend);

+    $px1->SetMaxValue($px1->GetCeilMaxValue());

+    $px1->SetMinValue(min(0, $px1->GetFloorMinValue()));

+    $px1->SetWidth($WIDTH);

+    $px1->SetHeight($HEIGHT);

+    $px1->SetYLabel($langs->trans("NbOfTicket"));

+    $px1->SetShading(3);

+    $px1->SetHorizTickIncrement(1);

+    $px1->mode = 'depth';

+    $px1->SetTitle($langs->trans("NumberOfTicketsByMonth"));

+

+    $px1->draw($filenamenb, $fileurlnb);

 }

 

 // Build graphic amount of object

@@ -121,36 +123,38 @@
 

 if (!$user->rights->societe->client->voir || $user->socid)

 {

-	$filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';

-	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';

-} else {

-	$filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';

-	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';

+    $filenameamount = $dir.'/ticketsamountinyear-'.$user->id.'-'.$year.'.png';

+    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$user->id.'-'.$year.'.png';

+}

+else

+{

+    $filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';

+    $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';

 }

 

 $px2 = new DolGraph();

 $mesg = $px2->isGraphKo();

 if (!$mesg)

 {

-	$px2->SetData($data);

-	$i = $startyear; $legend = array();

-	while ($i <= $endyear)

-	{

-		$legend[] = $i;

-		$i++;

-	}

-	$px2->SetLegend($legend);

-	$px2->SetMaxValue($px2->GetCeilMaxValue());

-	$px2->SetMinValue(min(0, $px2->GetFloorMinValue()));

-	$px2->SetWidth($WIDTH);

-	$px2->SetHeight($HEIGHT);

-	$px2->SetYLabel($langs->trans("AmountOfTickets"));

-	$px2->SetShading(3);

-	$px2->SetHorizTickIncrement(1);

-	$px2->mode = 'depth';

-	$px2->SetTitle($langs->trans("AmountOfTicketsByMonthHT"));

-

-	$px2->draw($filenameamount, $fileurlamount);

+    $px2->SetData($data);

+    $i = $startyear; $legend = array();

+    while ($i <= $endyear)

+    {

+        $legend[] = $i;

+        $i++;

+    }

+    $px2->SetLegend($legend);

+    $px2->SetMaxValue($px2->GetCeilMaxValue());

+    $px2->SetMinValue(min(0, $px2->GetFloorMinValue()));

+    $px2->SetWidth($WIDTH);

+    $px2->SetHeight($HEIGHT);

+    $px2->SetYLabel($langs->trans("AmountOfTickets"));

+    $px2->SetShading(3);

+    $px2->SetHorizTickIncrement(1);

+    $px2->mode = 'depth';

+    $px2->SetTitle($langs->trans("AmountOfTicketsByMonthHT"));

+

+    $px2->draw($filenameamount, $fileurlamount);

 }

 

 

@@ -158,36 +162,38 @@
 

 if (!$user->rights->societe->client->voir || $user->socid)

 {

-	$filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';

-	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';

-} else {

-	$filename_avg = $dir.'/ticketsaverage-'.$year.'.png';

-	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';

+    $filename_avg = $dir.'/ticketsaverage-'.$user->id.'-'.$year.'.png';

+    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$user->id.'-'.$year.'.png';

+}

+else

+{

+    $filename_avg = $dir.'/ticketsaverage-'.$year.'.png';

+    $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';

 }

 

 $px3 = new DolGraph();

 $mesg = $px3->isGraphKo();

 if (!$mesg)

 {

-	$px3->SetData($data);

-	$i = $startyear; $legend = array();

-	while ($i <= $endyear)

-	{

-		$legend[] = $i;

-		$i++;

-	}

-	$px3->SetLegend($legend);

-	$px3->SetYLabel($langs->trans("AmountAverage"));

-	$px3->SetMaxValue($px3->GetCeilMaxValue());

-	$px3->SetMinValue($px3->GetFloorMinValue());

-	$px3->SetWidth($WIDTH);

-	$px3->SetHeight($HEIGHT);

-	$px3->SetShading(3);

-	$px3->SetHorizTickIncrement(1);

-	$px3->mode = 'depth';

-	$px3->SetTitle($langs->trans("AmountAverage"));

-

-	$px3->draw($filename_avg, $fileurl_avg);

+    $px3->SetData($data);

+    $i = $startyear; $legend = array();

+    while ($i <= $endyear)

+    {

+        $legend[] = $i;

+        $i++;

+    }

+    $px3->SetLegend($legend);

+    $px3->SetYLabel($langs->trans("AmountAverage"));

+    $px3->SetMaxValue($px3->GetCeilMaxValue());

+    $px3->SetMinValue($px3->GetFloorMinValue());

+    $px3->SetWidth($WIDTH);

+    $px3->SetHeight($HEIGHT);

+    $px3->SetShading(3);

+    $px3->SetHorizTickIncrement(1);

+    $px3->mode = 'depth';

+    $px3->SetTitle($langs->trans("AmountAverage"));

+

+    $px3->draw($filename_avg, $fileurl_avg);

 }

 

 

@@ -213,7 +219,7 @@
 

 complete_head_from_modules($conf, $langs, null, $head, $h, $type);

 

-print dol_get_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);

+dol_fiche_head($head, 'byyear', $langs->trans("Statistics"), -1);

 

 

 print '<div class="fichecenter"><div class="fichethirdleft">';

@@ -235,7 +241,7 @@
 // Status

 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';

 $liststatus = $object->fields['fk_statut']['arrayofkeyval'];

-print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4, 0, 0, '', 1);

+print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4, 0, 0, '', 1);

 print '</td></tr>';

 // Year

 print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';

@@ -303,12 +309,13 @@
 

 // Show graphs

 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';

-if ($mesg) { print $mesg; } else {

-	print $px1->show();

-	print "<br>\n";

-	//print $px2->show();

-	//print "<br>\n";

-	//print $px3->show();

+if ($mesg) { print $mesg; }

+else {

+    print $px1->show();

+    print "<br>\n";

+    //print $px2->show();

+    //print "<br>\n";

+    //print $px3->show();

 }

 print '</td></tr></table>';

 

@@ -316,7 +323,7 @@
 print '</div></div></div>';

 print '<div style="clear:both"></div>';

 

-print dol_get_fiche_end();

+dol_fiche_end();

 

 // End of page

 llxFooter();