From 065d7996f5f5e860affb3f5993c371a88345c501 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 20 Nov 2011 15:25:08 +0100
Subject: [PATCH] Fix: better with json_encode

---
 htdocs/adherents/index.php          |   8 +-
 htdocs/comm/propal/index.php        |   2 +-
 htdocs/commande/index.php           |   2 +-
 htdocs/compta/deplacement/index.php |   2 +-
 htdocs/compta/dons/index.php        |   2 +-
 htdocs/contrat/index.php            |   2 +-
 htdocs/core/lib/functions.lib.php   | 378 +++++++++++++---------------
 htdocs/fourn/commande/index.php     |   2 +-
 htdocs/societe/index.php            |   6 +-
 9 files changed, 188 insertions(+), 216 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index bf775508338..98cd8deac0b 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -178,10 +178,10 @@ if ($conf->use_javascript_ajax)
     */
 
     $dataseries=array();
-    $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'values'=>array(round($SommeB)));
-    $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'values'=>array(round($SommeC)));
-    $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'values'=>array(round($SommeD)));
-    $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'values'=>array(round($SommeA)));
+    $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'data'=>round($SommeB));
+    $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'data'=>round($SommeC));
+    $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'data'=>round($SommeD));
+    $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'data'=>round($SommeA));
     $data=array('series'=>$dataseries);
     dol_print_graph('stats',300,180,$data,1,'pie',1);
     print '</td></tr>';
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index ae58515b3a4..6e5c667466c 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -121,7 +121,7 @@ if ($resql)
     $listofstatus=array(0,1,2,3,4);
     foreach ($listofstatus as $status)
     {
-        $dataseries[]=array('label'=>$propalstatic->LibStatut($status,1),'values'=>array(0=>(isset($vals[$status])?$vals[$status]:0)));
+        $dataseries[]=array('label'=>$propalstatic->LibStatut($status,1),'data'=>(isset($vals[$status])?$vals[$status]:0));
         if (! $conf->use_javascript_ajax)
         {
             $var=!$var;
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 2a3c6d91175..ee8c7db198b 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -121,7 +121,7 @@ if ($resql)
     $bool=false;
     foreach ($listofstatus as $status)
     {
-        $dataseries[]=array('label'=>$commandestatic->LibStatut($status,$bool,1),'values'=>array(0=>(isset($vals[$status.$bool])?$vals[$status.$bool]:0)));
+        $dataseries[]=array('label'=>$commandestatic->LibStatut($status,$bool,1),'data'=>(isset($vals[$status.$bool])?$vals[$status.$bool]:0));
         if ($status==3 && $bool==false) $bool=true;
         else $bool=false;
     }
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index abd0e3d226e..2cb32b122e1 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -105,7 +105,7 @@ print "</tr>\n";
 $listoftype=$tripandexpense_static->listOfTypes();
 foreach ($listoftype as $code => $label)
 {
-    $dataseries[]=array('label'=>$label,'values'=>array(0=>(isset($nb[$code])?$nb[$code]:0)));
+    $dataseries[]=array('label'=>$label,'data'=>(isset($nb[$code])?$nb[$code]:0));
 }
 
 if ($conf->use_javascript_ajax)
diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php
index 9f9dab362e1..b849975e147 100644
--- a/htdocs/compta/dons/index.php
+++ b/htdocs/compta/dons/index.php
@@ -87,7 +87,7 @@ print "</tr>\n";
 $listofstatus=array(0,1,-1,2);
 foreach ($listofstatus as $status)
 {
-    $dataseries[]=array('label'=>$donstatic->LibStatut($status,1),'values'=>array(0=>(isset($nb[$status])?$nb[$status]:0)));
+    $dataseries[]=array('label'=>$donstatic->LibStatut($status,1),'data'=>(isset($nb[$status])?$nb[$status]:0));
 }
 
 if ($conf->use_javascript_ajax)
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 5c3ae69c4a6..31bcbeb9127 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -180,7 +180,7 @@ $var=true;
 $listofstatus=array(0,4,4,5); $bool=false;
 foreach($listofstatus as $status)
 {
-    $dataseries[]=array('label'=>$staticcontratligne->LibStatut($status,1,($bool?1:0)),'values'=>array(0=>($nb[$status.$bool]?$nb[$status.$bool]:0)));
+    $dataseries[]=array('label'=>$staticcontratligne->LibStatut($status,1,($bool?1:0)),'data'=>($nb[$status.$bool]?$nb[$status.$bool]:0));
     if (! $conf->use_javascript_ajax)
     {
         $var=!$var;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2a906d070ba..5570fc2d963 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1500,213 +1500,185 @@ function dolibarr_trunc($string,$size=40,$trunc='right',$stringencoding='')
 
 /**
  *  Show a javascript graph
- *  @param      htmlid          Html id name
- *  @param      width           Width in pixel
- *  @param      height          Height in pixel
- *  @param      data            Data array
- *  @param      showlegend      1 to show legend, 0 otherwise
- *  @param      type            Type of graph ('pie', 'barline')
- *  @param      showpercent     Show percent (with type='pie' only)
- *  @param      url             Param to add an url to click values
+ *  
+ *  @param		string	$htmlid			Html id name
+ *  @param		int		$width			Width in pixel
+ *  @param		int		$height			Height in pixel
+ *  @param		array	$data			Data array
+ *  @param		int		$showlegend		1 to show legend, 0 otherwise
+ *  @param		string	$type			Type of graph ('pie', 'barline')
+ *  @param		int		$showpercent	Show percent (with type='pie' only)
+ *  @param		string	$url			Param to add an url to click values
+ *  @return		void
  */
 function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',$showpercent=0,$url='')
 {
-    global $conf,$langs;
-    global $theme_datacolor;    // To have var kept when function is called several times
-    if (empty($conf->use_javascript_ajax)) return;
-    $jsgraphlib='flot';
-    $datacolor=array();
-
+	global $conf,$langs;
+	global $theme_datacolor;    // To have var kept when function is called several times
+	if (empty($conf->use_javascript_ajax)) return;
+	$jsgraphlib='flot';
+	$datacolor=array();
+	
 	// Load colors of theme into $datacolor array
-    $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
-    if (is_readable($color_file))
-    {
-        include_once($color_file);
-        if (isset($theme_datacolor))
-        {
-            $datacolor=array();
-            foreach($theme_datacolor as $val)
-            {
-                $datacolor[]="#".sprintf("%02x",$val[0]).sprintf("%02x",$val[1]).sprintf("%02x",$val[2]);
-            }
-        }
-    }
-    print '<div id="'.$htmlid.'" style="width:'.$width.'px;height:'.$height.'px;"></div>';
-
-    // We use Flot js lib
-    if ($jsgraphlib == 'flot')
-    {
-        if ($type == 'pie')
-        {
-            // data is   array('series'=>array(serie1,serie2,...),
-            //                 'seriestype'=>array('bar','line',...),
-            //                 'seriescolor'=>array(0=>'#999999',1=>'#999999',...)
-            //                 'xlabel'=>array(0=>labelx1,1=>labelx2,...));
-            // serieX is array('label'=>'label', values=>array(0=>val))
-        	print '
-        	<script type="text/javascript">
-			jQuery(function () {
-        	var data = ['."\n";
-            $i=0;
-            foreach($data['series'] as $serie)
-            {
-                //print '{ label: "'.($showlegend?$serie['values'][0]:$serie['label'].'<br>'.$serie['values'][0]).'", data: '.$serie['values'][0].' }';
-                print '{ label: "'.dol_escape_js($serie['label']).'", data: '.$serie['values'][0].' }';
-                if ($i < count($data['series'])) print ',';
-                print "\n";
-                $i++;
-            }
-            print '];
-
-            function plotWithOptions() {
-                jQuery.plot(jQuery("#'.$htmlid.'"), data,
-                {
-                    series: {
-                            pie: {
-                            show: true,
-                            radius: 3/4,
-                            label: {
-                                show: true,
-                                radius: 3/4,
-                                formatter: function(label, series) {
-                                    var percent=Math.round(series.percent);
-                                    var number=series.data[0][1];
-                                    return \'';
-                            print '<div style="font-size:8pt;text-align:center;padding:2px;color:white;">';
-                            if ($url) print '<a style="color: #FFFFFF;" border="0" href="'.$url.'=">';
-                            print '\'+'.($showlegend?'number':'label+\'<br/>\'+number');
-                            if (! empty($showpercent)) print '+\'<br/>\'+percent+\'%\'';
-                            print '+\'';
-                            if ($url) print '</a>';
-                            print '</div>\';
-                                },
-                                background: {
-                                    opacity: 0.5,
-                                    color: \'#000000\'
-                                }
-                            }
-                    } },
-                    zoom: {
-                        interactive: true
-                    },
-                    pan: {
-                        interactive: true
-                    },
-                    ';
-                    $i=0; $outputserie=0;
-            		if (count($datacolor))
-            		{
-	                    print 'colors: [';
-	                    foreach($datacolor as $val)
-	                    {
-                            if ($outputserie > 0) print ',';
-	                        print '"'.(empty($data['seriescolor'][$i])?$val:$data['seriescolor'][$i]).'"';
-	                        $outputserie++;
-	                        $i++;
-	                    }
-            			print '], ';
-            		}
-                    print 'legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
-                });
-            }
-            plotWithOptions();
-            });
-            </script>';
-        }
-        else if ($type == 'barline')
-        {
-            // data is   array('series'=>array(serie1,serie2,...),
-            //                 'seriestype'=>array('bar','line',...),
-            //                 'seriescolor'=>array(0=>'#999999',1=>'#999999',...)
-            //                 'xlabel'=>array(0=>labelx1,1=>labelx2,...));
-            // serieX is array('label'=>'label', values=>array(0=>y1,1=>y2,...)) with same nb of value than into xlabel
-            print '
-            <script type="text/javascript">
-            jQuery(function () {
-            var data = [';
-            $i=1; $outputserie=0;
-            foreach($data['series'] as $serie)
-            {
-                if ($data['seriestype'][$i-1]=='line') { $i++; continue; };
-                if ($outputserie > 0) print ',';
-                print '{ bars: { stack: 0, show: true, barWidth: 0.9, align: \'center\' }, label: \''.dol_escape_js($serie['label']).'\', data: [';
-                $j=1;
-                foreach($serie['values'] as $val)
-                {
-                    print '['.$j.','.$val.']';
-                    if ($j < count($serie['values'])) print ', ';
-                    $j++;
-                }
-                print ']}'."\n";
-                $outputserie++;
-                $i++;
-            }
-            if ($outputserie) print ', ';
-            //print '];
-            //var datalines = [';
-            $i=1; $outputserie=0;
-            foreach($data['series'] as $serie)
-            {
-                if (empty($data['seriestype'][$i-1]) || $data['seriestype'][$i-1]=='bar') { $i++; continue; };
-                if ($outputserie > 0) print ',';
-                print '{ lines: { show: true }, label: \''.dol_escape_js($serie['label']).'\', data: [';
-                $j=1;
-                foreach($serie['values'] as $val)
-                {
-                    print '['.$j.','.$val.']';
-                    if ($j < count($serie['values'])) print ', ';
-                    $j++;
-                }
-                print ']}'."\n";
-                $outputserie++;
-                $i++;
-            }
-            print '];
-            var dataticks = [';
-            $i=1;
-            foreach($data['xlabel'] as $label)
-            {
-                print '['.$i.',\''.$label.'\']';
-                if ($i < count($data['xlabel'])) print ',';
-                $i++;
-            }
-            print '];
-
-            function plotWithOptions() {
-                jQuery.plot(jQuery("#'.$htmlid.'"), data,
-                {
-                    series: {
-                            stack: 0
-                    },
-                    zoom: {
-                        interactive: true
-                    },
-                    pan: {
-                        interactive: true
-                    },
-                    ';
-                    if (count($datacolor))
-                    {
-                        print 'colors: [';
-                        $j=0;
-                        foreach($datacolor as $val)
-                        {
-                            print '"'.$val.'"';
-                            if ($j < count($datacolor)) print ',';
-                            $j++;
-                        }
-                        print '], ';
-                    }
-                    print 'legend: {show: '.($showlegend?'true':'false').'},
-                    xaxis: {ticks: dataticks},
-                });
-            }
-            plotWithOptions();
-            });
-            </script>';
-        }
-        else print 'BadValueForPArameterType';
-    }
+	$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
+	if (is_readable($color_file))
+	{
+		include_once($color_file);
+		if (isset($theme_datacolor))
+		{
+			$datacolor=array();
+			foreach($theme_datacolor as $val)
+			{
+				$datacolor[]="#".sprintf("%02x",$val[0]).sprintf("%02x",$val[1]).sprintf("%02x",$val[2]);
+			}
+		}
+	}
+	print '<div id="'.$htmlid.'" style="width:'.$width.'px;height:'.$height.'px;"></div>';
+	
+	// We use Flot js lib
+	if ($jsgraphlib == 'flot')
+	{
+		if ($type == 'pie')
+		{
+			// data is   array('series'=>array(serie1,serie2,...),
+			//                 'seriestype'=>array('bar','line',...),
+			//                 'seriescolor'=>array(0=>'#999999',1=>'#999999',...)
+			//                 'xlabel'=>array(0=>labelx1,1=>labelx2,...));
+			// serieX is array('label'=>'label', data=>val)
+			print '
+			<script type="text/javascript">
+			$(function () {
+				var data = '.json_encode($data['series']).';
+				
+				function plotWithOptions() {
+					$.plot($("#'.$htmlid.'"), data,
+					{
+						series: {
+							pie: {
+								show: true,
+								radius: 3/4,
+								label: {
+									show: true,
+									radius: 3/4,
+									formatter: function(label, series) {
+										var percent=Math.round(series.percent);
+										var number=series.data[0][1];
+										return \'';
+										print '<div style="font-size:8pt;text-align:center;padding:2px;color:white;">';
+										if ($url) print '<a style="color: #FFFFFF;" border="0" href="'.$url.'=">';
+										print '\'+'.($showlegend?'number':'label+\'<br/>\'+number');
+										if (! empty($showpercent)) print '+\'<br/>\'+percent+\'%\'';
+										print '+\'';
+										if ($url) print '</a>';
+										print '</div>\';
+									},
+									background: {
+										opacity: 0.5,
+										color: \'#000000\'
+									}
+								}
+							}
+						},
+						zoom: {
+							interactive: true
+						},
+						pan: {
+							interactive: true
+						},';
+						if (count($datacolor))
+						{
+							print 'colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
+						}
+						print 'legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
+					});
+				}
+				plotWithOptions();
+			});
+			</script>';
+		}
+		else if ($type == 'barline')
+		{
+			// data is   array('series'=>array(serie1,serie2,...),
+			//                 'seriestype'=>array('bar','line',...),
+			//                 'seriescolor'=>array(0=>'#999999',1=>'#999999',...)
+			//                 'xlabel'=>array(0=>labelx1,1=>labelx2,...));
+			// serieX is array('label'=>'label', values=>array(0=>y1,1=>y2,...)) with same nb of value than into xlabel
+			print '
+			<script type="text/javascript">
+			$(function () {
+				var data = [';
+				$i=1; $outputserie=0;
+				foreach($data['series'] as $serie)
+				{
+					if ($data['seriestype'][$i-1]=='line') { $i++; continue; };
+					if ($outputserie > 0) print ',';
+					print '{ bars: { stack: 0, show: true, barWidth: 0.9, align: \'center\' }, label: \''.dol_escape_js($serie['label']).'\', data: [';
+					$j=1;
+					foreach($serie['values'] as $val)
+					{
+						print '['.$j.','.$val.']';
+						if ($j < count($serie['values'])) print ', ';
+						$j++;
+					}
+					print ']}'."\n";
+					$outputserie++; $i++;
+				}
+				if ($outputserie) print ', ';
+				//print '];
+				//var datalines = [';
+				$i=1; $outputserie=0;
+				foreach($data['series'] as $serie)
+				{
+					if (empty($data['seriestype'][$i-1]) || $data['seriestype'][$i-1]=='bar') { $i++; continue; };
+					if ($outputserie > 0) print ',';
+					print '{ lines: { show: true }, label: \''.dol_escape_js($serie['label']).'\', data: [';
+					$j=1;
+					foreach($serie['values'] as $val)
+					{
+						print '['.$j.','.$val.']';
+						if ($j < count($serie['values'])) print ', ';
+						$j++;
+					}
+					print ']}'."\n";
+					$outputserie++; $i++;
+				}
+				print '];
+				var dataticks = [';
+				$i=1;
+				foreach($data['xlabel'] as $label)
+				{
+					print '['.$i.',\''.$label.'\']';
+					if ($i < count($data['xlabel'])) print ',';
+					$i++;
+				}
+				print '];
+				
+				function plotWithOptions() {
+					$.plot(jQuery("#'.$htmlid.'"), data,
+					{
+						series: {
+							stack: 0
+						},
+						zoom: {
+							interactive: true
+						},
+						pan: {
+							interactive: true
+						},';
+						if (count($datacolor))
+						{
+							print 'colors: '.json_encode($datacolor).',';
+						}
+						print 'legend: {show: '.($showlegend?'true':'false').'},
+						xaxis: {ticks: dataticks}
+					});
+				}
+				plotWithOptions();
+			});
+			</script>';
+		}
+		else print 'BadValueForPArameterType';
+	}
 }
 
 /**
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 69654b83e42..fa1349fe59b 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -118,7 +118,7 @@ if ($resql)
     print "</tr>\n";
     foreach (array(0,1,2,3,4,5,6) as $statut)
     {
-        $dataseries[]=array('label'=>$commandestatic->LibStatut($statut,1),'values'=>array(0=>(isset($vals[$statut])?$vals[$statut]:0)));
+        $dataseries[]=array('label'=>$commandestatic->LibStatut($statut,1),'data'=>(isset($vals[$statut])?$vals[$statut]:0));
         if (! $conf->use_javascript_ajax)
         {
             $var=!$var;
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index bbd9938994d..ebbdbfd7292 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -108,9 +108,9 @@ if ($conf->use_javascript_ajax && ((round($third['prospect'])?1:0)+(round($third
 {
     print '<tr><td align="center">';
     $dataseries=array();
-    if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'values'=>array(round($third['prospect'])));
-    if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'values'=>array(round($third['customer'])));
-    if ($conf->fournisseur->enabled && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Suppliers"),'values'=>array(round($third['supplier'])));
+    if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'data'=>round($third['prospect']));
+    if ($conf->societe->enabled && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'data'=>round($third['customer']));
+    if ($conf->fournisseur->enabled && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Suppliers"),'data'=>round($third['supplier']));
     $data=array('series'=>$dataseries);
     dol_print_graph('stats',300,180,$data,1,'pie',0);
     print '</td></tr>';