Merge pull request #6 from ivanscm/fix-for-php7

Fix constructor constructor declaration & modify string to array

Author: dmelo

library/pData.php

@@ -265,7 +265,7 @@ function limits()
 
    /* Mark all series as drawable */
    function drawAll()
-    { foreach($this->Data["Series"] as $Key => $Value) { if ( $this->Data["Abscissa"] != $Key ) { $this->Data["Series"][$Key]["isDrawable"]=TRUE; } } }    
+    { foreach($this->Data["Series"] as $Key => $Value) { if ( $this->Data["Abscissa"] != $Key ) { $this->Data["Series"][$Key]["isDrawable"]=TRUE; } } }
 
    /* Return the average value of the given serie */
    function getSerieAverage($Serie)
@@ -606,7 +606,7 @@ function initialise($Serie)
        $this->Data["Series"][$Serie]["Color"]["Alpha"] = 100;
       }
     }
-     
+
    function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
     {
      $Abscissa = $this->Data["Abscissa"];
@@ -777,12 +777,13 @@ function saveOrientation($Orientation) { $this->Data["Orientation"]=$Orientation
    function convertToArray($Value)
     { return array($Values); }
 
+
    /* Class string wrapper */
    function __toString()
     { return("pData object."); }
 
-   function left($value,$NbChar)	{ return substr($value,0,$NbChar); }  
-   function right($value,$NbChar)	{ return substr($value,strlen($value)-$NbChar,$NbChar); }  
-   function mid($value,$Depart,$NbChar)	{ return substr($value,$Depart-1,$NbChar); }  
+   function left($value,$NbChar)	{ return substr($value,0,$NbChar); }
+   function right($value,$NbChar)	{ return substr($value,strlen($value)-$NbChar,$NbChar); }
+   function mid($value,$Depart,$NbChar)	{ return substr($value,$Depart-1,$NbChar); }
   }
 ?>

library/pDraw.php

@@ -573,7 +573,7 @@ function drawRectangleMarker($X,$Y,$Format="")
     }
 
    /* Drawn a spline based on the bezier function */
-   function drawSpline($Coordinates,$Format="")
+   function drawSpline($Coordinates,$Format=array())
     {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
@@ -632,7 +632,7 @@ function drawSpline($Coordinates,$Format="")
     }
 
    /* Draw a bezier curve with two controls points */
-   function drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format="")
+   function drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format=array())
     {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;