BOINC / boinc

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pStock.class.php

Indentation +160 added lines, -160 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pStock - class to draw stock charts
 
      Version     : 2.1.3
@@ -13,204 +13,204 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("STOCK_MISSING_SERIE"	, 180001);
+    define("STOCK_MISSING_SERIE"	, 180001);
 
- /* pStock class definition */
- class pStock
-  {
-   var $pChartObject;
-   var $pDataObject;
+    /* pStock class definition */
+    class pStock
+    {
+    var $pChartObject;
+    var $pDataObject;
 
-   /* Class creator */
-   function pStock($pChartObject,$pDataObject)
+    /* Class creator */
+    function pStock($pChartObject,$pDataObject)
     {
-     $this->pChartObject = $pChartObject;
-     $this->pDataObject  = $pDataObject;
+        $this->pChartObject = $pChartObject;
+        $this->pDataObject  = $pDataObject;
     }
 
-   /* Draw a stock chart */
-   function drawStockChart($Format="")
+    /* Draw a stock chart */
+    function drawStockChart($Format="")
     {
-     $SerieOpen		= isset($Format["SerieOpen"]) ? $Format["SerieOpen"] : "Open";
-     $SerieClose	= isset($Format["SerieClose"]) ? $Format["SerieClose"] : "Close";
-     $SerieMin		= isset($Format["SerieMin"]) ? $Format["SerieMin"] : "Min";
-     $SerieMax		= isset($Format["SerieMax"]) ? $Format["SerieMax"] : "Max";
-     $SerieMedian	= isset($Format["SerieMedian"]) ? $Format["SerieMedian"] : NULL;
-     $LineWidth		= isset($Format["LineWidth"]) ? $Format["LineWidth"] : 1;
-     $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : 0;
-     $LineG		= isset($Format["LineG"]) ? $Format["LineG"] : 0;
-     $LineB		= isset($Format["LineB"]) ? $Format["LineB"] : 0;
-     $LineAlpha		= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 100;
-     $ExtremityWidth	= isset($Format["ExtremityWidth"]) ? $Format["ExtremityWidth"] : 1;
-     $ExtremityLength	= isset($Format["ExtremityLength"]) ? $Format["ExtremityLength"] : 3;
-     $ExtremityR	= isset($Format["ExtremityR"]) ? $Format["ExtremityR"] : 0;
-     $ExtremityG	= isset($Format["ExtremityG"]) ? $Format["ExtremityG"] : 0;
-     $ExtremityB	= isset($Format["ExtremityB"]) ? $Format["ExtremityB"] : 0;
-     $ExtremityAlpha	= isset($Format["ExtremityAlpha"]) ? $Format["ExtremityAlpha"] : 100;
-     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 8;
-     $BoxUpR		= isset($Format["BoxUpR"]) ? $Format["BoxUpR"] : 188;
-     $BoxUpG		= isset($Format["BoxUpG"]) ? $Format["BoxUpG"] : 224;
-     $BoxUpB		= isset($Format["BoxUpB"]) ? $Format["BoxUpB"] : 46;
-     $BoxUpAlpha	= isset($Format["BoxUpAlpha"]) ? $Format["BoxUpAlpha"] : 100;
-     $BoxUpSurrounding	= isset($Format["BoxUpSurrounding"]) ? $Format["BoxUpSurrounding"] : NULL;
-     $BoxUpBorderR	= isset($Format["BoxUpBorderR"]) ? $Format["BoxUpBorderR"] : $BoxUpR-20;
-     $BoxUpBorderG	= isset($Format["BoxUpBorderG"]) ? $Format["BoxUpBorderG"] : $BoxUpG-20;
-     $BoxUpBorderB	= isset($Format["BoxUpBorderB"]) ? $Format["BoxUpBorderB"] : $BoxUpB-20;
-     $BoxUpBorderAlpha	= isset($Format["BoxUpBorderAlpha"]) ? $Format["BoxUpBorderAlpha"] : 100;
-     $BoxDownR		= isset($Format["BoxDownR"]) ? $Format["BoxDownR"] : 224;
-     $BoxDownG		= isset($Format["BoxDownG"]) ? $Format["BoxDownG"] : 100;
-     $BoxDownB		= isset($Format["BoxDownB"]) ? $Format["BoxDownB"] : 46;
-     $BoxDownAlpha	= isset($Format["BoxDownAlpha"]) ? $Format["BoxDownAlpha"] : 100;
-     $BoxDownSurrounding= isset($Format["BoxDownSurrounding"]) ? $Format["BoxDownSurrounding"] : NULL;
-     $BoxDownBorderR	= isset($Format["BoxDownBorderR"]) ? $Format["BoxDownBorderR"] : $BoxDownR-20;
-     $BoxDownBorderG	= isset($Format["BoxDownBorderG"]) ? $Format["BoxDownBorderG"] : $BoxDownG-20;
-     $BoxDownBorderB	= isset($Format["BoxDownBorderB"]) ? $Format["BoxDownBorderB"] : $BoxDownB-20;
-     $BoxDownBorderAlpha= isset($Format["BoxDownBorderAlpha"]) ? $Format["BoxDownBorderAlpha"] : 100;
-     $ShadowOnBoxesOnly	= isset($Format["ShadowOnBoxesOnly"]) ? $Format["ShadowOnBoxesOnly"] : TRUE;
-     $MedianR		= isset($Format["MedianR"]) ? $Format["MedianR"] : 255;
-     $MedianG		= isset($Format["MedianG"]) ? $Format["MedianG"] : 0;
-     $MedianB		= isset($Format["MedianB"]) ? $Format["MedianB"] : 0;
-     $MedianAlpha	= isset($Format["MedianAlpha"]) ? $Format["MedianAlpha"] : 100;
-     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
-     $ImageMapTitle	= isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : "Stock Chart";
-
-
-     /* Data Processing */
-     $Data    = $this->pDataObject->getData();
-     $Palette = $this->pDataObject->getPalette();
-
-     if ( $BoxUpSurrounding != NULL )	{ $BoxUpBorderR = $BoxUpR + $BoxUpSurrounding; $BoxUpBorderG = $BoxUpG + $BoxUpSurrounding; $BoxUpBorderB = $BoxUpB + $BoxUpSurrounding; }
-     if ( $BoxDownSurrounding != NULL )	{ $BoxDownBorderR = $BoxDownR + $BoxDownSurrounding; $BoxDownBorderG = $BoxDownG + $BoxDownSurrounding; $BoxDownBorderB = $BoxDownB + $BoxDownSurrounding; }
-
-     if ( $LineWidth != 1 ) { $LineOffset = $LineWidth / 2; }
-     $BoxOffset = $BoxWidth / 2;
-
-     $Data = $this->pChartObject->DataSet->getData();
-     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
-
-     if ( !isset($Data["Series"][$SerieOpen]) || !isset($Data["Series"][$SerieClose]) || !isset($Data["Series"][$SerieMin]) || !isset($Data["Series"][$SerieMax]) )
-      return(STOCK_MISSING_SERIE);
-
-     $Plots = "";
-     foreach($Data["Series"][$SerieOpen]["Data"] as $Key => $Value)
-      {
-       $Point = "";
-       if ( isset($Data["Series"][$SerieClose]["Data"][$Key]) || isset($Data["Series"][$SerieMin]["Data"][$Key]) || isset($Data["Series"][$SerieMax]["Data"][$Key]) )
+        $SerieOpen		= isset($Format["SerieOpen"]) ? $Format["SerieOpen"] : "Open";
+        $SerieClose	= isset($Format["SerieClose"]) ? $Format["SerieClose"] : "Close";
+        $SerieMin		= isset($Format["SerieMin"]) ? $Format["SerieMin"] : "Min";
+        $SerieMax		= isset($Format["SerieMax"]) ? $Format["SerieMax"] : "Max";
+        $SerieMedian	= isset($Format["SerieMedian"]) ? $Format["SerieMedian"] : NULL;
+        $LineWidth		= isset($Format["LineWidth"]) ? $Format["LineWidth"] : 1;
+        $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : 0;
+        $LineG		= isset($Format["LineG"]) ? $Format["LineG"] : 0;
+        $LineB		= isset($Format["LineB"]) ? $Format["LineB"] : 0;
+        $LineAlpha		= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 100;
+        $ExtremityWidth	= isset($Format["ExtremityWidth"]) ? $Format["ExtremityWidth"] : 1;
+        $ExtremityLength	= isset($Format["ExtremityLength"]) ? $Format["ExtremityLength"] : 3;
+        $ExtremityR	= isset($Format["ExtremityR"]) ? $Format["ExtremityR"] : 0;
+        $ExtremityG	= isset($Format["ExtremityG"]) ? $Format["ExtremityG"] : 0;
+        $ExtremityB	= isset($Format["ExtremityB"]) ? $Format["ExtremityB"] : 0;
+        $ExtremityAlpha	= isset($Format["ExtremityAlpha"]) ? $Format["ExtremityAlpha"] : 100;
+        $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 8;
+        $BoxUpR		= isset($Format["BoxUpR"]) ? $Format["BoxUpR"] : 188;
+        $BoxUpG		= isset($Format["BoxUpG"]) ? $Format["BoxUpG"] : 224;
+        $BoxUpB		= isset($Format["BoxUpB"]) ? $Format["BoxUpB"] : 46;
+        $BoxUpAlpha	= isset($Format["BoxUpAlpha"]) ? $Format["BoxUpAlpha"] : 100;
+        $BoxUpSurrounding	= isset($Format["BoxUpSurrounding"]) ? $Format["BoxUpSurrounding"] : NULL;
+        $BoxUpBorderR	= isset($Format["BoxUpBorderR"]) ? $Format["BoxUpBorderR"] : $BoxUpR-20;
+        $BoxUpBorderG	= isset($Format["BoxUpBorderG"]) ? $Format["BoxUpBorderG"] : $BoxUpG-20;
+        $BoxUpBorderB	= isset($Format["BoxUpBorderB"]) ? $Format["BoxUpBorderB"] : $BoxUpB-20;
+        $BoxUpBorderAlpha	= isset($Format["BoxUpBorderAlpha"]) ? $Format["BoxUpBorderAlpha"] : 100;
+        $BoxDownR		= isset($Format["BoxDownR"]) ? $Format["BoxDownR"] : 224;
+        $BoxDownG		= isset($Format["BoxDownG"]) ? $Format["BoxDownG"] : 100;
+        $BoxDownB		= isset($Format["BoxDownB"]) ? $Format["BoxDownB"] : 46;
+        $BoxDownAlpha	= isset($Format["BoxDownAlpha"]) ? $Format["BoxDownAlpha"] : 100;
+        $BoxDownSurrounding= isset($Format["BoxDownSurrounding"]) ? $Format["BoxDownSurrounding"] : NULL;
+        $BoxDownBorderR	= isset($Format["BoxDownBorderR"]) ? $Format["BoxDownBorderR"] : $BoxDownR-20;
+        $BoxDownBorderG	= isset($Format["BoxDownBorderG"]) ? $Format["BoxDownBorderG"] : $BoxDownG-20;
+        $BoxDownBorderB	= isset($Format["BoxDownBorderB"]) ? $Format["BoxDownBorderB"] : $BoxDownB-20;
+        $BoxDownBorderAlpha= isset($Format["BoxDownBorderAlpha"]) ? $Format["BoxDownBorderAlpha"] : 100;
+        $ShadowOnBoxesOnly	= isset($Format["ShadowOnBoxesOnly"]) ? $Format["ShadowOnBoxesOnly"] : TRUE;
+        $MedianR		= isset($Format["MedianR"]) ? $Format["MedianR"] : 255;
+        $MedianG		= isset($Format["MedianG"]) ? $Format["MedianG"] : 0;
+        $MedianB		= isset($Format["MedianB"]) ? $Format["MedianB"] : 0;
+        $MedianAlpha	= isset($Format["MedianAlpha"]) ? $Format["MedianAlpha"] : 100;
+        $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+        $ImageMapTitle	= isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : "Stock Chart";
+
+
+        /* Data Processing */
+        $Data    = $this->pDataObject->getData();
+        $Palette = $this->pDataObject->getPalette();
+
+        if ( $BoxUpSurrounding != NULL )	{ $BoxUpBorderR = $BoxUpR + $BoxUpSurrounding; $BoxUpBorderG = $BoxUpG + $BoxUpSurrounding; $BoxUpBorderB = $BoxUpB + $BoxUpSurrounding; }
+        if ( $BoxDownSurrounding != NULL )	{ $BoxDownBorderR = $BoxDownR + $BoxDownSurrounding; $BoxDownBorderG = $BoxDownG + $BoxDownSurrounding; $BoxDownBorderB = $BoxDownB + $BoxDownSurrounding; }
+
+        if ( $LineWidth != 1 ) { $LineOffset = $LineWidth / 2; }
+        $BoxOffset = $BoxWidth / 2;
+
+        $Data = $this->pChartObject->DataSet->getData();
+        list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+
+        if ( !isset($Data["Series"][$SerieOpen]) || !isset($Data["Series"][$SerieClose]) || !isset($Data["Series"][$SerieMin]) || !isset($Data["Series"][$SerieMax]) )
+        return(STOCK_MISSING_SERIE);
+
+        $Plots = "";
+        foreach($Data["Series"][$SerieOpen]["Data"] as $Key => $Value)
+        {
+        $Point = "";
+        if ( isset($Data["Series"][$SerieClose]["Data"][$Key]) || isset($Data["Series"][$SerieMin]["Data"][$Key]) || isset($Data["Series"][$SerieMax]["Data"][$Key]) )
         $Point = array($Value,$Data["Series"][$SerieClose]["Data"][$Key],$Data["Series"][$SerieMin]["Data"][$Key],$Data["Series"][$SerieMax]["Data"][$Key]);
-       if ( $SerieMedian != NULL && isset($Data["Series"][$SerieMedian]["Data"][$Key]) )
+        if ( $SerieMedian != NULL && isset($Data["Series"][$SerieMedian]["Data"][$Key]) )
         $Point[] = $Data["Series"][$SerieMedian]["Data"][$Key];
 
-       $Plots[] = $Point;
-      }
+        $Plots[] = $Point;
+        }
 
-     $AxisID	= $Data["Series"][$SerieOpen]["Axis"];
-     $Mode	= $Data["Axis"][$AxisID]["Display"];
-     $Format	= $Data["Axis"][$AxisID]["Format"];
-     $Unit	= $Data["Axis"][$AxisID]["Unit"];
+        $AxisID	= $Data["Series"][$SerieOpen]["Axis"];
+        $Mode	= $Data["Axis"][$AxisID]["Display"];
+        $Format	= $Data["Axis"][$AxisID]["Format"];
+        $Unit	= $Data["Axis"][$AxisID]["Unit"];
 
-     $YZero	= $this->pChartObject->scaleComputeY(0,array("AxisID"=>$AxisID));
-     $XStep	= ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
+        $YZero	= $this->pChartObject->scaleComputeY(0,array("AxisID"=>$AxisID));
+        $XStep	= ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
 
-     $X = $this->pChartObject->GraphAreaX1 + $XMargin;
-     $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
+        $X = $this->pChartObject->GraphAreaX1 + $XMargin;
+        $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
 
-     $LineSettings	= array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
-     $ExtremitySettings	= array("R"=>$ExtremityR,"G"=>$ExtremityG,"B"=>$ExtremityB,"Alpha"=>$ExtremityAlpha);
-     $BoxUpSettings	= array("R"=>$BoxUpR,"G"=>$BoxUpG,"B"=>$BoxUpB,"Alpha"=>$BoxUpAlpha,"BorderR"=>$BoxUpBorderR,"BorderG"=>$BoxUpBorderG,"BorderB"=>$BoxUpBorderB,"BorderAlpha"=>$BoxUpBorderAlpha);
-     $BoxDownSettings	= array("R"=>$BoxDownR,"G"=>$BoxDownG,"B"=>$BoxDownB,"Alpha"=>$BoxDownAlpha,"BorderR"=>$BoxDownBorderR,"BorderG"=>$BoxDownBorderG,"BorderB"=>$BoxDownBorderB,"BorderAlpha"=>$BoxDownBorderAlpha);
-     $MedianSettings	= array("R"=>$MedianR,"G"=>$MedianG,"B"=>$MedianB,"Alpha"=>$MedianAlpha);
+        $LineSettings	= array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
+        $ExtremitySettings	= array("R"=>$ExtremityR,"G"=>$ExtremityG,"B"=>$ExtremityB,"Alpha"=>$ExtremityAlpha);
+        $BoxUpSettings	= array("R"=>$BoxUpR,"G"=>$BoxUpG,"B"=>$BoxUpB,"Alpha"=>$BoxUpAlpha,"BorderR"=>$BoxUpBorderR,"BorderG"=>$BoxUpBorderG,"BorderB"=>$BoxUpBorderB,"BorderAlpha"=>$BoxUpBorderAlpha);
+        $BoxDownSettings	= array("R"=>$BoxDownR,"G"=>$BoxDownG,"B"=>$BoxDownB,"Alpha"=>$BoxDownAlpha,"BorderR"=>$BoxDownBorderR,"BorderG"=>$BoxDownBorderG,"BorderB"=>$BoxDownBorderB,"BorderAlpha"=>$BoxDownBorderAlpha);
+        $MedianSettings	= array("R"=>$MedianR,"G"=>$MedianG,"B"=>$MedianB,"Alpha"=>$MedianAlpha);
 
-     foreach($Plots as $Key =>$Points)
-      {
-       $PosArray = $this->pChartObject->scaleComputeY($Points,array("AxisID"=>$AxisID));
+        foreach($Plots as $Key =>$Points)
+        {
+        $PosArray = $this->pChartObject->scaleComputeY($Points,array("AxisID"=>$AxisID));
 
-       $Values = "Open :".$Data["Series"][$SerieOpen]["Data"][$Key]."<BR>Close : ".$Data["Series"][$SerieClose]["Data"][$Key]."<BR>Min : ".$Data["Series"][$SerieMin]["Data"][$Key]."<BR>Max : ".$Data["Series"][$SerieMax]["Data"][$Key]."<BR>";
-       if ( $SerieMedian != NULL ) { $Values = $Values."Median : ".$Data["Series"][$SerieMedian]["Data"][$Key]."<BR>"; }
-       if ( $PosArray[0] > $PosArray[1] ) { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxUpR,$BoxUpG,$BoxUpB); } else { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxDownR,$BoxDownG,$BoxDownB); } 
+        $Values = "Open :".$Data["Series"][$SerieOpen]["Data"][$Key]."<BR>Close : ".$Data["Series"][$SerieClose]["Data"][$Key]."<BR>Min : ".$Data["Series"][$SerieMin]["Data"][$Key]."<BR>Max : ".$Data["Series"][$SerieMax]["Data"][$Key]."<BR>";
+        if ( $SerieMedian != NULL ) { $Values = $Values."Median : ".$Data["Series"][$SerieMedian]["Data"][$Key]."<BR>"; }
+        if ( $PosArray[0] > $PosArray[1] ) { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxUpR,$BoxUpG,$BoxUpB); } else { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxDownR,$BoxDownG,$BoxDownB); } 
 
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
         {
-         if ( $YZero > $this->pChartObject->GraphAreaY2-1 ) { $YZero = $this->pChartObject->GraphAreaY2-1; }
-         if ( $YZero < $this->pChartObject->GraphAreaY1+1 ) { $YZero = $this->pChartObject->GraphAreaY1+1; }
+            if ( $YZero > $this->pChartObject->GraphAreaY2-1 ) { $YZero = $this->pChartObject->GraphAreaY2-1; }
+            if ( $YZero < $this->pChartObject->GraphAreaY1+1 ) { $YZero = $this->pChartObject->GraphAreaY1+1; }
 
-         if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
+            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
 
-         if ( $ShadowOnBoxesOnly ) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
+            if ( $ShadowOnBoxesOnly ) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
 
-         if ( $LineWidth == 1 )
-          $this->pChartObject->drawLine($X,$PosArray[2],$X,$PosArray[3],$LineSettings);
-         else
-          $this->pChartObject->drawFilledRectangle($X-$LineOffset,$PosArray[2],$X+$LineOffset,$PosArray[3],$LineSettings);
+            if ( $LineWidth == 1 )
+            $this->pChartObject->drawLine($X,$PosArray[2],$X,$PosArray[3],$LineSettings);
+            else
+            $this->pChartObject->drawFilledRectangle($X-$LineOffset,$PosArray[2],$X+$LineOffset,$PosArray[3],$LineSettings);
 
-         if ( $ExtremityWidth == 1 )
-          {
-           $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[2],$X+$ExtremityLength,$PosArray[2],$ExtremitySettings);
-           $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[3],$X+$ExtremityLength,$PosArray[3],$ExtremitySettings);
+            if ( $ExtremityWidth == 1 )
+            {
+            $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[2],$X+$ExtremityLength,$PosArray[2],$ExtremitySettings);
+            $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[3],$X+$ExtremityLength,$PosArray[3],$ExtremitySettings);
 
-           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$ExtremityLength).",".floor($PosArray[2]).",".floor($X+$ExtremityLength).",".floor($PosArray[3]),$ImageMapColor,$ImageMapTitle,$Values); }
-          }
-         else
-          {
-           $this->pChartObject->drawFilledRectangle($X-$ExtremityLength,$PosArray[2],$X+$ExtremityLength,$PosArray[2]-$ExtremityWidth,$ExtremitySettings);
-           $this->pChartObject->drawFilledRectangle($X-$ExtremityLength,$PosArray[3],$X+$ExtremityLength,$PosArray[3]+$ExtremityWidth,$ExtremitySettings);
+            if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$ExtremityLength).",".floor($PosArray[2]).",".floor($X+$ExtremityLength).",".floor($PosArray[3]),$ImageMapColor,$ImageMapTitle,$Values); }
+            }
+            else
+            {
+            $this->pChartObject->drawFilledRectangle($X-$ExtremityLength,$PosArray[2],$X+$ExtremityLength,$PosArray[2]-$ExtremityWidth,$ExtremitySettings);
+            $this->pChartObject->drawFilledRectangle($X-$ExtremityLength,$PosArray[3],$X+$ExtremityLength,$PosArray[3]+$ExtremityWidth,$ExtremitySettings);
 
-           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$ExtremityLength).",".floor($PosArray[2]-$ExtremityWidth).",".floor($X+$ExtremityLength).",".floor($PosArray[3]+$ExtremityWidth),$ImageMapColor,$ImageMapTitle,$Values); }
-          }
+            if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$ExtremityLength).",".floor($PosArray[2]-$ExtremityWidth).",".floor($X+$ExtremityLength).",".floor($PosArray[3]+$ExtremityWidth),$ImageMapColor,$ImageMapTitle,$Values); }
+            }
 
-         if ( $ShadowOnBoxesOnly ) { $this->pChartObject->Shadow = $RestoreShadow; }
+            if ( $ShadowOnBoxesOnly ) { $this->pChartObject->Shadow = $RestoreShadow; }
 
-         if ( $PosArray[0] > $PosArray[1] )
-          $this->pChartObject->drawFilledRectangle($X-$BoxOffset,$PosArray[0],$X+$BoxOffset,$PosArray[1],$BoxUpSettings);
-         else
-          $this->pChartObject->drawFilledRectangle($X-$BoxOffset,$PosArray[0],$X+$BoxOffset,$PosArray[1],$BoxDownSettings);
+            if ( $PosArray[0] > $PosArray[1] )
+            $this->pChartObject->drawFilledRectangle($X-$BoxOffset,$PosArray[0],$X+$BoxOffset,$PosArray[1],$BoxUpSettings);
+            else
+            $this->pChartObject->drawFilledRectangle($X-$BoxOffset,$PosArray[0],$X+$BoxOffset,$PosArray[1],$BoxDownSettings);
 
-         if ( isset($PosArray[4]) )
-          $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[4],$X+$ExtremityLength,$PosArray[4],$MedianSettings);
+            if ( isset($PosArray[4]) )
+            $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[4],$X+$ExtremityLength,$PosArray[4],$MedianSettings);
 
-         $X = $X + $XStep;
+            $X = $X + $XStep;
         }
-       elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+        elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
         {
-         if ( $YZero > $this->pChartObject->GraphAreaX2-1 ) { $YZero = $this->pChartObject->GraphAreaX2-1; }
-         if ( $YZero < $this->pChartObject->GraphAreaX1+1 ) { $YZero = $this->pChartObject->GraphAreaX1+1; }
+            if ( $YZero > $this->pChartObject->GraphAreaX2-1 ) { $YZero = $this->pChartObject->GraphAreaX2-1; }
+            if ( $YZero < $this->pChartObject->GraphAreaX1+1 ) { $YZero = $this->pChartObject->GraphAreaX1+1; }
 
-         if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
+            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
 
-         if ( $LineWidth == 1 )
-          $this->pChartObject->drawLine($PosArray[2],$Y,$PosArray[3],$Y,$LineSettings);
-         else
-          $this->pChartObject->drawFilledRectangle($PosArray[2],$Y-$LineOffset,$PosArray[3],$Y+$LineOffset,$LineSettings);
+            if ( $LineWidth == 1 )
+            $this->pChartObject->drawLine($PosArray[2],$Y,$PosArray[3],$Y,$LineSettings);
+            else
+            $this->pChartObject->drawFilledRectangle($PosArray[2],$Y-$LineOffset,$PosArray[3],$Y+$LineOffset,$LineSettings);
 
-         if ( $ShadowOnBoxesOnly ) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
+            if ( $ShadowOnBoxesOnly ) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
 
-         if ( $ExtremityWidth == 1 )
-          {
-           $this->pChartObject->drawLine($PosArray[2],$Y-$ExtremityLength,$PosArray[2],$Y+$ExtremityLength,$ExtremitySettings);
-           $this->pChartObject->drawLine($PosArray[3],$Y-$ExtremityLength,$PosArray[3],$Y+$ExtremityLength,$ExtremitySettings);
+            if ( $ExtremityWidth == 1 )
+            {
+            $this->pChartObject->drawLine($PosArray[2],$Y-$ExtremityLength,$PosArray[2],$Y+$ExtremityLength,$ExtremitySettings);
+            $this->pChartObject->drawLine($PosArray[3],$Y-$ExtremityLength,$PosArray[3],$Y+$ExtremityLength,$ExtremitySettings);
 
-           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($PosArray[2]).",".floor($Y-$ExtremityLength).",".floor($PosArray[3]).",".floor($Y+$ExtremityLength),$ImageMapColor,$ImageMapTitle,$Values); }
-          }
-         else
-          {
-           $this->pChartObject->drawFilledRectangle($PosArray[2],$Y-$ExtremityLength,$PosArray[2]-$ExtremityWidth,$Y+$ExtremityLength,$ExtremitySettings);
-           $this->pChartObject->drawFilledRectangle($PosArray[3],$Y-$ExtremityLength,$PosArray[3]+$ExtremityWidth,$Y+$ExtremityLength,$ExtremitySettings);
+            if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($PosArray[2]).",".floor($Y-$ExtremityLength).",".floor($PosArray[3]).",".floor($Y+$ExtremityLength),$ImageMapColor,$ImageMapTitle,$Values); }
+            }
+            else
+            {
+            $this->pChartObject->drawFilledRectangle($PosArray[2],$Y-$ExtremityLength,$PosArray[2]-$ExtremityWidth,$Y+$ExtremityLength,$ExtremitySettings);
+            $this->pChartObject->drawFilledRectangle($PosArray[3],$Y-$ExtremityLength,$PosArray[3]+$ExtremityWidth,$Y+$ExtremityLength,$ExtremitySettings);
 
-           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($PosArray[2]-$ExtremityWidth).",".floor($Y-$ExtremityLength).",".floor($PosArray[3]+$ExtremityWidth).",".floor($Y+$ExtremityLength),$ImageMapColor,$ImageMapTitle,$Values); }
-          }
+            if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($PosArray[2]-$ExtremityWidth).",".floor($Y-$ExtremityLength).",".floor($PosArray[3]+$ExtremityWidth).",".floor($Y+$ExtremityLength),$ImageMapColor,$ImageMapTitle,$Values); }
+            }
 
-         if ( $ShadowOnBoxesOnly ) { $this->pChartObject->Shadow = $RestoreShadow; }
+            if ( $ShadowOnBoxesOnly ) { $this->pChartObject->Shadow = $RestoreShadow; }
 
-         if ( $PosArray[0] < $PosArray[1] )
-          $this->pChartObject->drawFilledRectangle($PosArray[0],$Y-$BoxOffset,$PosArray[1],$Y+$BoxOffset,$BoxUpSettings);
-         else
-          $this->pChartObject->drawFilledRectangle($PosArray[0],$Y-$BoxOffset,$PosArray[1],$Y+$BoxOffset,$BoxDownSettings);
+            if ( $PosArray[0] < $PosArray[1] )
+            $this->pChartObject->drawFilledRectangle($PosArray[0],$Y-$BoxOffset,$PosArray[1],$Y+$BoxOffset,$BoxUpSettings);
+            else
+            $this->pChartObject->drawFilledRectangle($PosArray[0],$Y-$BoxOffset,$PosArray[1],$Y+$BoxOffset,$BoxDownSettings);
 
-         if ( isset($PosArray[4]) )
-          $this->pChartObject->drawLine($PosArray[4],$Y-$ExtremityLength,$PosArray[4],$Y+$ExtremityLength,$MedianSettings);
+            if ( isset($PosArray[4]) )
+            $this->pChartObject->drawLine($PosArray[4],$Y-$ExtremityLength,$PosArray[4],$Y+$ExtremityLength,$MedianSettings);
 
-         $Y = $Y + $XStep;
+            $Y = $Y + $XStep;
+        }
         }
-      }
     }
-  }
+    }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pCache.class.php

Indentation +205 added lines, -205 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pCache - speed up the rendering by caching up the pictures
 
      Version     : 2.1.3
@@ -13,268 +13,268 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- /* pData class definition */
- class pCache
-  {
-   var $CacheFolder;
-   var $CacheIndex;
-   var $CacheDB;
+    /* pData class definition */
+    class pCache
+    {
+    var $CacheFolder;
+    var $CacheIndex;
+    var $CacheDB;
 
-   /* Class creator */
-   function pCache($Settings="")
+    /* Class creator */
+    function pCache($Settings="")
     {
-     $CacheFolder	= isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
-     $CacheIndex	= isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
-     $CacheDB		= isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
+        $CacheFolder	= isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
+        $CacheIndex	= isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
+        $CacheDB		= isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
 
-     $this->CacheFolder	= $CacheFolder;
-     $this->CacheIndex	= $CacheIndex;
-     $this->CacheDB	= $CacheDB;
+        $this->CacheFolder	= $CacheFolder;
+        $this->CacheIndex	= $CacheIndex;
+        $this->CacheDB	= $CacheDB;
 
-     if (!file_exists($this->CacheFolder."/".$this->CacheIndex)) { touch($this->CacheFolder."/".$this->CacheIndex); }
-     if (!file_exists($this->CacheFolder."/".$this->CacheDB))    { touch($this->CacheFolder."/".$this->CacheDB); }
+        if (!file_exists($this->CacheFolder."/".$this->CacheIndex)) { touch($this->CacheFolder."/".$this->CacheIndex); }
+        if (!file_exists($this->CacheFolder."/".$this->CacheDB))    { touch($this->CacheFolder."/".$this->CacheDB); }
     }
 
-   /* Flush the cache contents */
-   function flush()
+    /* Flush the cache contents */
+    function flush()
     {
-     if (file_exists($this->CacheFolder."/".$this->CacheIndex)) { unlink($this->CacheFolder."/".$this->CacheIndex); touch($this->CacheFolder."/".$this->CacheIndex); }
-     if (file_exists($this->CacheFolder."/".$this->CacheDB))    { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
+        if (file_exists($this->CacheFolder."/".$this->CacheIndex)) { unlink($this->CacheFolder."/".$this->CacheIndex); touch($this->CacheFolder."/".$this->CacheIndex); }
+        if (file_exists($this->CacheFolder."/".$this->CacheDB))    { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
     }
 
-   /* Return the MD5 of the data array to clearly identify the chart */
-   function getHash($Data,$Marker="")
+    /* Return the MD5 of the data array to clearly identify the chart */
+    function getHash($Data,$Marker="")
     { return(md5($Marker.serialize($Data->Data))); }
 
-   /* Write the generated picture to the cache */
-   function writeToCache($ID,$pChartObject)
+    /* Write the generated picture to the cache */
+    function writeToCache($ID,$pChartObject)
     {
-     /* Compute the paths */
-     $TemporaryFile = $this->CacheFolder."/tmp_".rand(0,1000).".png";
-     $Database      = $this->CacheFolder."/".$this->CacheDB;
-     $Index         = $this->CacheFolder."/".$this->CacheIndex;
-
-     /* Flush the picture to a temporary file */
-     imagepng($pChartObject->Picture ,$TemporaryFile);
-
-     /* Retrieve the files size */
-     $PictureSize = filesize($TemporaryFile);
-     $DBSize      = filesize($Database);
-
-     /* Save the index */
-     $Handle = fopen($Index,"a");
-     fwrite($Handle, $ID.",".$DBSize.",".$PictureSize.",".time().",0      \r\n");
-     fclose($Handle);
-
-     /* Get the picture raw contents */
-     $Handle = fopen($TemporaryFile,"r");
-     $Raw    = fread($Handle,$PictureSize);
-     fclose($Handle);
-
-     /* Save the picture in the solid database file */
-     $Handle = fopen($Database,"a");
-     fwrite($Handle, $Raw);
-     fclose($Handle);
-
-     /* Remove temporary file */
-     unlink($TemporaryFile);
+        /* Compute the paths */
+        $TemporaryFile = $this->CacheFolder."/tmp_".rand(0,1000).".png";
+        $Database      = $this->CacheFolder."/".$this->CacheDB;
+        $Index         = $this->CacheFolder."/".$this->CacheIndex;
+
+        /* Flush the picture to a temporary file */
+        imagepng($pChartObject->Picture ,$TemporaryFile);
+
+        /* Retrieve the files size */
+        $PictureSize = filesize($TemporaryFile);
+        $DBSize      = filesize($Database);
+
+        /* Save the index */
+        $Handle = fopen($Index,"a");
+        fwrite($Handle, $ID.",".$DBSize.",".$PictureSize.",".time().",0      \r\n");
+        fclose($Handle);
+
+        /* Get the picture raw contents */
+        $Handle = fopen($TemporaryFile,"r");
+        $Raw    = fread($Handle,$PictureSize);
+        fclose($Handle);
+
+        /* Save the picture in the solid database file */
+        $Handle = fopen($Database,"a");
+        fwrite($Handle, $Raw);
+        fclose($Handle);
+
+        /* Remove temporary file */
+        unlink($TemporaryFile);
     }
 
-   /* Remove object older than the specified TS */
-   function removeOlderThan($Expiry)
+    /* Remove object older than the specified TS */
+    function removeOlderThan($Expiry)
     { $this->dbRemoval(array("Expiry"=>$Expiry)); }
 
-   /* Remove an object from the cache */
-   function remove($ID)
+    /* Remove an object from the cache */
+    function remove($ID)
     { $this->dbRemoval(array("Name"=>$ID)); }
 
-   /* Remove with specified criterias */
-   function dbRemoval($Settings)
+    /* Remove with specified criterias */
+    function dbRemoval($Settings)
     {
-     $ID     = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
-     $Expiry = isset($Settings["Expiry"]) ? $Settings["Expiry"] : -(24*60*60);
-     $TS     = time()-$Expiry;
-
-     /* Compute the paths */
-     $Database     = $this->CacheFolder."/".$this->CacheDB;
-     $Index        = $this->CacheFolder."/".$this->CacheIndex;
-     $DatabaseTemp = $this->CacheFolder."/".$this->CacheDB.".tmp";
-     $IndexTemp    = $this->CacheFolder."/".$this->CacheIndex.".tmp";
-
-     /* Single file removal */
-     if ( $ID != NULL )
-      {
-       /* Retrieve object informations */
-       $Object = $this->isInCache($ID,TRUE);
-
-       /* If it's not in the cache DB, go away */
-       if ( !$Object ) { return(0); }
-      }
-
-     /* Create the temporary files */
-     if (!file_exists($DatabaseTemp)) { touch($DatabaseTemp); }
-     if (!file_exists($IndexTemp))    { touch($IndexTemp); }
-
-     /* Open the file handles */
-     $IndexHandle     = @fopen($Index, "r");
-     $IndexTempHandle = @fopen($IndexTemp, "w");
-     $DBHandle        = @fopen($Database, "r");
-     $DBTempHandle    = @fopen($DatabaseTemp, "w");
-
-     /* Remove the selected ID from the database */
-     while (!feof($IndexHandle))
-      {
-       $Entry    = fgets($IndexHandle, 4096);
-       $Entry    = str_replace("\r","",$Entry);
-       $Entry    = str_replace("\n","",$Entry);
-       $Settings = preg_split("/,/",$Entry);
-
-       if ( $Entry != "" )
+        $ID     = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
+        $Expiry = isset($Settings["Expiry"]) ? $Settings["Expiry"] : -(24*60*60);
+        $TS     = time()-$Expiry;
+
+        /* Compute the paths */
+        $Database     = $this->CacheFolder."/".$this->CacheDB;
+        $Index        = $this->CacheFolder."/".$this->CacheIndex;
+        $DatabaseTemp = $this->CacheFolder."/".$this->CacheDB.".tmp";
+        $IndexTemp    = $this->CacheFolder."/".$this->CacheIndex.".tmp";
+
+        /* Single file removal */
+        if ( $ID != NULL )
         {
-         $PicID       = $Settings[0];
-         $DBPos       = $Settings[1];
-         $PicSize     = $Settings[2];
-         $GeneratedTS = $Settings[3];
-         $Hits        = $Settings[4];
-
-         if ( $Settings[0] != $ID && $GeneratedTS > $TS)
-          {
-           $CurrentPos  = ftell($DBTempHandle);
-           fwrite($IndexTempHandle, $PicID.",".$CurrentPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
-
-           fseek($DBHandle,$DBPos);
-           $Picture = fread($DBHandle,$PicSize);
-           fwrite($DBTempHandle,$Picture);
-          }
+        /* Retrieve object informations */
+        $Object = $this->isInCache($ID,TRUE);
+
+        /* If it's not in the cache DB, go away */
+        if ( !$Object ) { return(0); }
+        }
+
+        /* Create the temporary files */
+        if (!file_exists($DatabaseTemp)) { touch($DatabaseTemp); }
+        if (!file_exists($IndexTemp))    { touch($IndexTemp); }
+
+        /* Open the file handles */
+        $IndexHandle     = @fopen($Index, "r");
+        $IndexTempHandle = @fopen($IndexTemp, "w");
+        $DBHandle        = @fopen($Database, "r");
+        $DBTempHandle    = @fopen($DatabaseTemp, "w");
+
+        /* Remove the selected ID from the database */
+        while (!feof($IndexHandle))
+        {
+        $Entry    = fgets($IndexHandle, 4096);
+        $Entry    = str_replace("\r","",$Entry);
+        $Entry    = str_replace("\n","",$Entry);
+        $Settings = preg_split("/,/",$Entry);
+
+        if ( $Entry != "" )
+        {
+            $PicID       = $Settings[0];
+            $DBPos       = $Settings[1];
+            $PicSize     = $Settings[2];
+            $GeneratedTS = $Settings[3];
+            $Hits        = $Settings[4];
+
+            if ( $Settings[0] != $ID && $GeneratedTS > $TS)
+            {
+            $CurrentPos  = ftell($DBTempHandle);
+            fwrite($IndexTempHandle, $PicID.",".$CurrentPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
+
+            fseek($DBHandle,$DBPos);
+            $Picture = fread($DBHandle,$PicSize);
+            fwrite($DBTempHandle,$Picture);
+            }
+        }
         }
-      }
 
-     /* Close the handles */
-     fclose($IndexHandle);
-     fclose($IndexTempHandle);
-     fclose($DBHandle);
-     fclose($DBTempHandle);
+        /* Close the handles */
+        fclose($IndexHandle);
+        fclose($IndexTempHandle);
+        fclose($DBHandle);
+        fclose($DBTempHandle);
 
-     /* Remove the prod files */
-     unlink($Database);
-     unlink($Index);
+        /* Remove the prod files */
+        unlink($Database);
+        unlink($Index);
 
-     /* Swap the temp & prod DB */
-     rename($DatabaseTemp,$Database);
-     rename($IndexTemp,$Index);
+        /* Swap the temp & prod DB */
+        rename($DatabaseTemp,$Database);
+        rename($IndexTemp,$Index);
     }
 
-   function isInCache($ID,$Verbose=FALSE,$UpdateHitsCount=FALSE)
+    function isInCache($ID,$Verbose=FALSE,$UpdateHitsCount=FALSE)
     {
-     /* Compute the paths */
-     $Index = $this->CacheFolder."/".$this->CacheIndex;
-
-     /* Search the picture in the index file */
-     $Handle = @fopen($Index, "r");
-     while (!feof($Handle))
-      {
-       $IndexPos = ftell($Handle);
-       $Entry = fgets($Handle, 4096);
-       if ( $Entry != "" )
+        /* Compute the paths */
+        $Index = $this->CacheFolder."/".$this->CacheIndex;
+
+        /* Search the picture in the index file */
+        $Handle = @fopen($Index, "r");
+        while (!feof($Handle))
+        {
+        $IndexPos = ftell($Handle);
+        $Entry = fgets($Handle, 4096);
+        if ( $Entry != "" )
         {
-         $Settings = preg_split("/,/",$Entry);
-         $PicID    = $Settings[0];
-         if ( $PicID == $ID )
-          {
-           fclose($Handle);
-
-           $DBPos       = $Settings[1];
-           $PicSize     = $Settings[2];
-           $GeneratedTS = $Settings[3];
-           $Hits        = intval($Settings[4]);
-
-           if ( $UpdateHitsCount )
+            $Settings = preg_split("/,/",$Entry);
+            $PicID    = $Settings[0];
+            if ( $PicID == $ID )
             {
-             $Hits++;
-             if ( strlen($Hits) < 7 ) { $Hits = $Hits.str_repeat(" ",7-strlen($Hits)); }
+            fclose($Handle);
+
+            $DBPos       = $Settings[1];
+            $PicSize     = $Settings[2];
+            $GeneratedTS = $Settings[3];
+            $Hits        = intval($Settings[4]);
 
-             $Handle = @fopen($Index, "r+");
-             fseek($Handle,$IndexPos);
-             fwrite($Handle, $PicID.",".$DBPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
-             fclose($Handle);
+            if ( $UpdateHitsCount )
+            {
+                $Hits++;
+                if ( strlen($Hits) < 7 ) { $Hits = $Hits.str_repeat(" ",7-strlen($Hits)); }
+
+                $Handle = @fopen($Index, "r+");
+                fseek($Handle,$IndexPos);
+                fwrite($Handle, $PicID.",".$DBPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
+                fclose($Handle);
             }
 
-           if ($Verbose)
+            if ($Verbose)
             { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); }
-           else
+            else
             { return(TRUE); }
-          }
+            }
         }
-      }
-     fclose($Handle);
+        }
+        fclose($Handle);
 
-     /* Picture isn't in the cache */
-     return(FALSE);
+        /* Picture isn't in the cache */
+        return(FALSE);
     }
 
-   /* Automatic output method based on the calling interface */
-   function autoOutput($ID,$Destination="output.png")
+    /* Automatic output method based on the calling interface */
+    function autoOutput($ID,$Destination="output.png")
     {
-     if (php_sapi_name() == "cli")
-      $this->saveFromCache($ID,$Destination);
-     else
-      $this->strokeFromCache($ID);
+        if (php_sapi_name() == "cli")
+        $this->saveFromCache($ID,$Destination);
+        else
+        $this->strokeFromCache($ID);
     }
 
-   function strokeFromCache($ID)
+    function strokeFromCache($ID)
     {
-     /* Get the raw picture from the cache */
-     $Picture = $this->getFromCache($ID);
+        /* Get the raw picture from the cache */
+        $Picture = $this->getFromCache($ID);
 
-     /* Do we have a hit? */
-     if ( $Picture == NULL ) { return(FALSE); }
+        /* Do we have a hit? */
+        if ( $Picture == NULL ) { return(FALSE); }
 
-     header('Content-type: image/png');
-     echo $Picture;
+        header('Content-type: image/png');
+        echo $Picture;
 
-     return(TRUE);
+        return(TRUE);
     }
 
-   function saveFromCache($ID,$Destination)
+    function saveFromCache($ID,$Destination)
     {
-     /* Get the raw picture from the cache */
-     $Picture = $this->getFromCache($ID);
+        /* Get the raw picture from the cache */
+        $Picture = $this->getFromCache($ID);
 
-     /* Do we have a hit? */
-     if ( $Picture == NULL ) { return(FALSE); }
+        /* Do we have a hit? */
+        if ( $Picture == NULL ) { return(FALSE); }
 
-     /* Flush the picture to a file */
-     $Handle = fopen($Destination,"w");
-     fwrite($Handle,$Picture);
-     fclose($Handle);
+        /* Flush the picture to a file */
+        $Handle = fopen($Destination,"w");
+        fwrite($Handle,$Picture);
+        fclose($Handle);
 
-     /* All went fine */
-     return(TRUE);
+        /* All went fine */
+        return(TRUE);
     }
 
-   function getFromCache($ID)
+    function getFromCache($ID)
     {
-     /* Compute the path */
-     $Database = $this->CacheFolder."/".$this->CacheDB;
+        /* Compute the path */
+        $Database = $this->CacheFolder."/".$this->CacheDB;
 
-     /* Lookup for the picture in the cache */
-     $CacheInfo = $this->isInCache($ID,TRUE,TRUE);
+        /* Lookup for the picture in the cache */
+        $CacheInfo = $this->isInCache($ID,TRUE,TRUE);
 
-     /* Not in the cache */
-     if (!$CacheInfo) { return(NULL); }
+        /* Not in the cache */
+        if (!$CacheInfo) { return(NULL); }
 
-     /* Get the database extended information */     
-     $DBPos   = $CacheInfo["DBPos"];
-     $PicSize = $CacheInfo["PicSize"];
+        /* Get the database extended information */     
+        $DBPos   = $CacheInfo["DBPos"];
+        $PicSize = $CacheInfo["PicSize"];
 
-     /* Extract the picture from the solid cache file */
-     $Handle = @fopen($Database, "r");
-     fseek($Handle,$DBPos);
-     $Picture = fread($Handle,$PicSize);
-     fclose($Handle);
+        /* Extract the picture from the solid cache file */
+        $Handle = @fopen($Database, "r");
+        fseek($Handle,$DBPos);
+        $Picture = fread($Handle,$PicSize);
+        fclose($Handle);
 
-     /* Return back the raw picture data */
-     return($Picture);
+        /* Return back the raw picture data */
+        return($Picture);
+    }
     }
-  }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pSurface.class.php

Indentation +234 added lines, -234 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pSurface - class to draw surface charts
 
      Version     : 2.1.3
@@ -13,303 +13,303 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("UNKNOWN"		, 0.123456789);
- define("IGNORED"		, -1);
+    define("UNKNOWN"		, 0.123456789);
+    define("IGNORED"		, -1);
 
- define("LABEL_POSITION_LEFT"	, 880001);
- define("LABEL_POSITION_RIGHT"	, 880002);
- define("LABEL_POSITION_TOP"	, 880003);
- define("LABEL_POSITION_BOTTOM"	, 880004);
+    define("LABEL_POSITION_LEFT"	, 880001);
+    define("LABEL_POSITION_RIGHT"	, 880002);
+    define("LABEL_POSITION_TOP"	, 880003);
+    define("LABEL_POSITION_BOTTOM"	, 880004);
 
- /* pStock class definition */
- class pSurface
-  {
-   var $pChartObject;
-   var $GridSizeX;
-   var $GridSizeY;
-   var $Points;
+    /* pStock class definition */
+    class pSurface
+    {
+    var $pChartObject;
+    var $GridSizeX;
+    var $GridSizeY;
+    var $Points;
 
-   /* Class creator */
-   function pSurface($pChartObject)
+    /* Class creator */
+    function pSurface($pChartObject)
     {
-     $this->pChartObject = $pChartObject;
-     $this->GridSize     = 10;
-     $this->Points       = "";
+        $this->pChartObject = $pChartObject;
+        $this->GridSize     = 10;
+        $this->Points       = "";
     }
 
-   /* Define the grid size and initialise the 2D matrix */
-   function setGrid($XSize=10,$YSize=10)
+    /* Define the grid size and initialise the 2D matrix */
+    function setGrid($XSize=10,$YSize=10)
     {
-     for($X=0; $X<=$XSize; $X++) { for($Y=0; $Y<=$YSize; $Y++) { $this->Points[$X][$Y]=UNKNOWN; } } 
+        for($X=0; $X<=$XSize; $X++) { for($Y=0; $Y<=$YSize; $Y++) { $this->Points[$X][$Y]=UNKNOWN; } } 
 
-     $this->GridSizeX = $XSize;
-     $this->GridSizeY = $YSize;
+        $this->GridSizeX = $XSize;
+        $this->GridSizeY = $YSize;
     }
 
-   /* Add a point on the grid */
-   function addPoint($X,$Y,$Value,$Force=TRUE)
+    /* Add a point on the grid */
+    function addPoint($X,$Y,$Value,$Force=TRUE)
     {
-     if ( $X < 0 || $X >$this->GridSizeX ) { return(0); }
-     if ( $Y < 0 || $Y >$this->GridSizeY ) { return(0); }
-
-     if ( $this->Points[$X][$Y] == UNKNOWN || $Force )
-      $this->Points[$X][$Y] = $Value;
-     elseif ( $this->Points[$X][$Y] == UNKNOWN )
-      $this->Points[$X][$Y] = $Value;
-     else
-      $this->Points[$X][$Y] = ($this->Points[$X][$Y] + $Value)/2;
+        if ( $X < 0 || $X >$this->GridSizeX ) { return(0); }
+        if ( $Y < 0 || $Y >$this->GridSizeY ) { return(0); }
+
+        if ( $this->Points[$X][$Y] == UNKNOWN || $Force )
+        $this->Points[$X][$Y] = $Value;
+        elseif ( $this->Points[$X][$Y] == UNKNOWN )
+        $this->Points[$X][$Y] = $Value;
+        else
+        $this->Points[$X][$Y] = ($this->Points[$X][$Y] + $Value)/2;
     }
 
-   /* Write the X labels */
-   function writeXLabels($Format="")
+    /* Write the X labels */
+    function writeXLabels($Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
-     $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
-     $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->pChartObject->FontColorA;
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 5;
-     $Position		= isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_TOP;
-     $Labels		= isset($Format["Labels"]) ? $Format["Labels"] : NULL;
-     $CountOffset	= isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
-
-     if ( $Labels != NULL && !is_array($Labels) ) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
-
-     $X0    = $this->pChartObject->GraphAreaX1;
-     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
-
-     $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-     if ( $Position == LABEL_POSITION_TOP )
-      {
-       $YPos  = $this->pChartObject->GraphAreaY1 - $Padding;
-       if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
-       if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-      }
-     elseif ( $Position == LABEL_POSITION_BOTTOM )
-      {
-       $YPos  = $this->pChartObject->GraphAreaY2 + $Padding;
-       if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-       if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
-      }
-     else
-      return(-1);
-
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       $XPos = floor($X0+$X*$XSize + $XSize/2);
-
-       if( $Labels == NULL || !isset($Labels[$X]) )
+        $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
+        $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
+        $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->pChartObject->FontColorA;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 5;
+        $Position		= isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_TOP;
+        $Labels		= isset($Format["Labels"]) ? $Format["Labels"] : NULL;
+        $CountOffset	= isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
+
+        if ( $Labels != NULL && !is_array($Labels) ) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
+
+        $X0    = $this->pChartObject->GraphAreaX1;
+        $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
+
+        $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+        if ( $Position == LABEL_POSITION_TOP )
+        {
+        $YPos  = $this->pChartObject->GraphAreaY1 - $Padding;
+        if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
+        if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
+        }
+        elseif ( $Position == LABEL_POSITION_BOTTOM )
+        {
+        $YPos  = $this->pChartObject->GraphAreaY2 + $Padding;
+        if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
+        if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
+        }
+        else
+        return(-1);
+
+        for($X=0;$X<=$this->GridSizeX;$X++)
+        {
+        $XPos = floor($X0+$X*$XSize + $XSize/2);
+
+        if( $Labels == NULL || !isset($Labels[$X]) )
         $Value = $X+$CountOffset;
-       else
+        else
         $Value = $Labels[$X];
 
-       $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
-      }
+        $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
+        }
     }
 
-   /* Write the Y labels */
-   function writeYLabels($Format="")
+    /* Write the Y labels */
+    function writeYLabels($Format="")
     {
-     $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
-     $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
-     $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
-     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->pChartObject->FontColorA;
-     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
-     $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 5;
-     $Position		= isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_LEFT;
-     $Labels		= isset($Format["Labels"]) ? $Format["Labels"] : NULL;
-     $CountOffset	= isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
-
-     if ( $Labels != NULL && !is_array($Labels) ) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
-
-     $Y0    = $this->pChartObject->GraphAreaY1;
-     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
-
-     $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-     if ( $Position == LABEL_POSITION_LEFT )
-      { $XPos  = $this->pChartObject->GraphAreaX1 - $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
-     elseif ( $Position == LABEL_POSITION_RIGHT )
-      { $XPos  = $this->pChartObject->GraphAreaX2 + $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-     else
-      return(-1);
-
-     for($Y=0;$Y<=$this->GridSizeY;$Y++)
-      {
-       $YPos = floor($Y0+$Y*$YSize + $YSize/2);
-
-       if( $Labels == NULL || !isset($Labels[$Y]) )
+        $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
+        $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
+        $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
+        $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->pChartObject->FontColorA;
+        $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+        $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 5;
+        $Position		= isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_LEFT;
+        $Labels		= isset($Format["Labels"]) ? $Format["Labels"] : NULL;
+        $CountOffset	= isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
+
+        if ( $Labels != NULL && !is_array($Labels) ) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
+
+        $Y0    = $this->pChartObject->GraphAreaY1;
+        $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
+
+        $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+        if ( $Position == LABEL_POSITION_LEFT )
+        { $XPos  = $this->pChartObject->GraphAreaX1 - $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
+        elseif ( $Position == LABEL_POSITION_RIGHT )
+        { $XPos  = $this->pChartObject->GraphAreaX2 + $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
+        else
+        return(-1);
+
+        for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        {
+        $YPos = floor($Y0+$Y*$YSize + $YSize/2);
+
+        if( $Labels == NULL || !isset($Labels[$Y]) )
         $Value = $Y+$CountOffset;
-       else
+        else
         $Value = $Labels[$Y];
 
-       $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
-      }
+        $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
+        }
     }
 
-   /* Draw the area arround the specified Threshold */
-   function drawContour($Threshold,$Format="")
+    /* Draw the area arround the specified Threshold */
+    function drawContour($Threshold,$Format="")
     {
-     $R		= isset($Format["R"]) ? $Format["R"] : 0;
-     $G		= isset($Format["G"]) ? $Format["G"] : 0;
-     $B		= isset($Format["B"]) ? $Format["B"] : 0;
-     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
-     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : 3;
-     $Padding	= isset($Format["Padding"]) ? $Format["Padding"] : 0;
-
-     $X0    = $this->pChartObject->GraphAreaX1;
-     $Y0    = $this->pChartObject->GraphAreaY1;
-     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
-     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
-
-     $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
-
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        $R		= isset($Format["R"]) ? $Format["R"] : 0;
+        $G		= isset($Format["G"]) ? $Format["G"] : 0;
+        $B		= isset($Format["B"]) ? $Format["B"] : 0;
+        $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+        $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : 3;
+        $Padding	= isset($Format["Padding"]) ? $Format["Padding"] : 0;
+
+        $X0    = $this->pChartObject->GraphAreaX1;
+        $Y0    = $this->pChartObject->GraphAreaY1;
+        $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
+        $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
+
+        $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
+
+        for($X=0;$X<=$this->GridSizeX;$X++)
         {
-         $Value = $this->Points[$X][$Y];
+        for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        {
+            $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED && $Value >= $Threshold)
-          {
-           $X1 = floor($X0+$X*$XSize)+$Padding;
-           $Y1 = floor($Y0+$Y*$YSize)+$Padding;
-           $X2 = floor($X0+$X*$XSize+$XSize);
-           $Y2 = floor($Y0+$Y*$YSize+$YSize);
+            if ( $Value != UNKNOWN && $Value != IGNORED && $Value >= $Threshold)
+            {
+            $X1 = floor($X0+$X*$XSize)+$Padding;
+            $Y1 = floor($Y0+$Y*$YSize)+$Padding;
+            $X2 = floor($X0+$X*$XSize+$XSize);
+            $Y2 = floor($Y0+$Y*$YSize+$YSize);
 
-           if ( $X > 0 && $this->Points[$X-1][$Y] != UNKNOWN && $this->Points[$X-1][$Y] != IGNORED && $this->Points[$X-1][$Y] < $Threshold)
+            if ( $X > 0 && $this->Points[$X-1][$Y] != UNKNOWN && $this->Points[$X-1][$Y] != IGNORED && $this->Points[$X-1][$Y] < $Threshold)
             $this->pChartObject->drawLine($X1,$Y1,$X1,$Y2,$Color);
-           if ( $Y > 0 && $this->Points[$X][$Y-1] != UNKNOWN && $this->Points[$X][$Y-1] != IGNORED && $this->Points[$X][$Y-1] < $Threshold)
+            if ( $Y > 0 && $this->Points[$X][$Y-1] != UNKNOWN && $this->Points[$X][$Y-1] != IGNORED && $this->Points[$X][$Y-1] < $Threshold)
             $this->pChartObject->drawLine($X1,$Y1,$X2,$Y1,$Color);
-           if ( $X < $this->GridSizeX && $this->Points[$X+1][$Y] != UNKNOWN && $this->Points[$X+1][$Y] != IGNORED && $this->Points[$X+1][$Y] < $Threshold)
+            if ( $X < $this->GridSizeX && $this->Points[$X+1][$Y] != UNKNOWN && $this->Points[$X+1][$Y] != IGNORED && $this->Points[$X+1][$Y] < $Threshold)
             $this->pChartObject->drawLine($X2,$Y1,$X2,$Y2,$Color);
-           if ( $Y < $this->GridSizeY && $this->Points[$X][$Y+1] != UNKNOWN && $this->Points[$X][$Y+1] != IGNORED && $this->Points[$X][$Y+1] < $Threshold)
+            if ( $Y < $this->GridSizeY && $this->Points[$X][$Y+1] != UNKNOWN && $this->Points[$X][$Y+1] != IGNORED && $this->Points[$X][$Y+1] < $Threshold)
             $this->pChartObject->drawLine($X1,$Y2,$X2,$Y2,$Color);
-          }
+            }
+        }
         }
-      }
     }
 
-   /* Draw the surface chart */
-   function drawSurface($Format="")
+    /* Draw the surface chart */
+    function drawSurface($Format="")
     {
-     $Palette		= isset($Format["Palette"]) ? $Format["Palette"] : NULL;
-     $ShadeR1		= isset($Format["ShadeR1"]) ? $Format["ShadeR1"] : 77;
-     $ShadeG1		= isset($Format["ShadeG1"]) ? $Format["ShadeG1"] : 205;
-     $ShadeB1		= isset($Format["ShadeB1"]) ? $Format["ShadeB1"] : 21;
-     $ShadeA1		= isset($Format["ShadeA1"]) ? $Format["ShadeA1"] : 40;
-     $ShadeR2		= isset($Format["ShadeR2"]) ? $Format["ShadeR2"] : 227;
-     $ShadeG2		= isset($Format["ShadeG2"]) ? $Format["ShadeG2"] : 135;
-     $ShadeB2		= isset($Format["ShadeB2"]) ? $Format["ShadeB2"] : 61;
-     $ShadeA2		= isset($Format["ShadeA2"]) ? $Format["ShadeA2"] : 100;
-     $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
-     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
-     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
-     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
-     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : -1;
-     $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 1;
-
-     $X0    = $this->pChartObject->GraphAreaX1;
-     $Y0    = $this->pChartObject->GraphAreaY1;
-     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
-     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
-
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        $Palette		= isset($Format["Palette"]) ? $Format["Palette"] : NULL;
+        $ShadeR1		= isset($Format["ShadeR1"]) ? $Format["ShadeR1"] : 77;
+        $ShadeG1		= isset($Format["ShadeG1"]) ? $Format["ShadeG1"] : 205;
+        $ShadeB1		= isset($Format["ShadeB1"]) ? $Format["ShadeB1"] : 21;
+        $ShadeA1		= isset($Format["ShadeA1"]) ? $Format["ShadeA1"] : 40;
+        $ShadeR2		= isset($Format["ShadeR2"]) ? $Format["ShadeR2"] : 227;
+        $ShadeG2		= isset($Format["ShadeG2"]) ? $Format["ShadeG2"] : 135;
+        $ShadeB2		= isset($Format["ShadeB2"]) ? $Format["ShadeB2"] : 61;
+        $ShadeA2		= isset($Format["ShadeA2"]) ? $Format["ShadeA2"] : 100;
+        $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
+        $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
+        $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
+        $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
+        $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : -1;
+        $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 1;
+
+        $X0    = $this->pChartObject->GraphAreaX1;
+        $Y0    = $this->pChartObject->GraphAreaY1;
+        $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
+        $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
+
+        for($X=0;$X<=$this->GridSizeX;$X++)
+        {
+        for($Y=0;$Y<=$this->GridSizeY;$Y++)
         {
-         $Value = $this->Points[$X][$Y];
+            $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED )
-          {
-           $X1 = floor($X0+$X*$XSize)+$Padding;
-           $Y1 = floor($Y0+$Y*$YSize)+$Padding;
-           $X2 = floor($X0+$X*$XSize+$XSize);
-           $Y2 = floor($Y0+$Y*$YSize+$YSize);
+            if ( $Value != UNKNOWN && $Value != IGNORED )
+            {
+            $X1 = floor($X0+$X*$XSize)+$Padding;
+            $Y1 = floor($Y0+$Y*$YSize)+$Padding;
+            $X2 = floor($X0+$X*$XSize+$XSize);
+            $Y2 = floor($Y0+$Y*$YSize+$YSize);
 
-           if ( $Palette != NULL )
+            if ( $Palette != NULL )
             {
-             if ( isset($Palette[$Value]) && isset($Palette[$Value]["R"]) ) { $R = $Palette[$Value]["R"]; } else { $R = 0; }
-             if ( isset($Palette[$Value]) && isset($Palette[$Value]["G"]) ) { $G = $Palette[$Value]["G"]; } else { $G = 0; }
-             if ( isset($Palette[$Value]) && isset($Palette[$Value]["B"]) ) { $B = $Palette[$Value]["B"]; } else { $B = 0; }
-             if ( isset($Palette[$Value]) && isset($Palette[$Value]["Alpha"]) ) { $Alpha = $Palette[$Value]["Alpha"]; } else { $Alpha = 1000; }
+                if ( isset($Palette[$Value]) && isset($Palette[$Value]["R"]) ) { $R = $Palette[$Value]["R"]; } else { $R = 0; }
+                if ( isset($Palette[$Value]) && isset($Palette[$Value]["G"]) ) { $G = $Palette[$Value]["G"]; } else { $G = 0; }
+                if ( isset($Palette[$Value]) && isset($Palette[$Value]["B"]) ) { $B = $Palette[$Value]["B"]; } else { $B = 0; }
+                if ( isset($Palette[$Value]) && isset($Palette[$Value]["Alpha"]) ) { $Alpha = $Palette[$Value]["Alpha"]; } else { $Alpha = 1000; }
             }
-           else
+            else
             {
-             $R = (($ShadeR2-$ShadeR1)/100)*$Value + $ShadeR1;
-             $G = (($ShadeG2-$ShadeG1)/100)*$Value + $ShadeG1;
-             $B = (($ShadeB2-$ShadeB1)/100)*$Value + $ShadeB1;
-             $Alpha = (($ShadeA2-$ShadeA1)/100)*$Value + $ShadeA1;
+                $R = (($ShadeR2-$ShadeR1)/100)*$Value + $ShadeR1;
+                $G = (($ShadeG2-$ShadeG1)/100)*$Value + $ShadeG1;
+                $B = (($ShadeB2-$ShadeB1)/100)*$Value + $ShadeB1;
+                $Alpha = (($ShadeA2-$ShadeA1)/100)*$Value + $ShadeA1;
             }
 
-           $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-           if ( $Border ) { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
-           if ( $Surrounding != -1 ) { $Settings["BorderR"] = $R+$Surrounding; $Settings["BorderG"] = $G+$Surrounding; $Settings["BorderB"] = $B+$Surrounding; }
+            $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+            if ( $Border ) { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
+            if ( $Surrounding != -1 ) { $Settings["BorderR"] = $R+$Surrounding; $Settings["BorderG"] = $G+$Surrounding; $Settings["BorderB"] = $B+$Surrounding; }
 
-           $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2-1,$Y2-1,$Settings);
-          }
+            $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2-1,$Y2-1,$Settings);
+            }
+        }
         }
-      }
     }
 
-   /* Compute the missing points */
-   function computeMissing()
+    /* Compute the missing points */
+    function computeMissing()
     {
-     $Missing = "";
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        $Missing = "";
+        for($X=0;$X<=$this->GridSizeX;$X++)
+        {
+        for($Y=0;$Y<=$this->GridSizeY;$Y++)
         {
-         if ( $this->Points[$X][$Y] == UNKNOWN )
-          $Missing[] = $X.",".$Y;
+            if ( $this->Points[$X][$Y] == UNKNOWN )
+            $Missing[] = $X.",".$Y;
         }
-      }
-     shuffle($Missing);
+        }
+        shuffle($Missing);
      
-     foreach($Missing as $Key => $Pos)
-      {
-       $Pos = preg_split("/,/",$Pos);
-       $X   = $Pos[0];
-       $Y   = $Pos[1];
+        foreach($Missing as $Key => $Pos)
+        {
+        $Pos = preg_split("/,/",$Pos);
+        $X   = $Pos[0];
+        $Y   = $Pos[1];
 
-       if ( $this->Points[$X][$Y] == UNKNOWN )
+        if ( $this->Points[$X][$Y] == UNKNOWN )
         {
-         $NearestNeighbor = $this->getNearestNeighbor($X,$Y);
+            $NearestNeighbor = $this->getNearestNeighbor($X,$Y);
 
-         $Value = 0; $Points = 0;
-         for($Xi=$X-$NearestNeighbor;$Xi<=$X+$NearestNeighbor;$Xi++)
-          {
-           for($Yi=$Y-$NearestNeighbor;$Yi<=$Y+$NearestNeighbor;$Yi++)
+            $Value = 0; $Points = 0;
+            for($Xi=$X-$NearestNeighbor;$Xi<=$X+$NearestNeighbor;$Xi++)
             {
-             if ($Xi >=0 && $Yi >= 0 && $Xi <= $this->GridSizeX && $Yi <= $this->GridSizeY && $this->Points[$Xi][$Yi] != UNKNOWN && $this->Points[$Xi][$Yi] != IGNORED)
-              {
-               $Value = $Value + $this->Points[$Xi][$Yi]; $Points++;
-              }
+            for($Yi=$Y-$NearestNeighbor;$Yi<=$Y+$NearestNeighbor;$Yi++)
+            {
+                if ($Xi >=0 && $Yi >= 0 && $Xi <= $this->GridSizeX && $Yi <= $this->GridSizeY && $this->Points[$Xi][$Yi] != UNKNOWN && $this->Points[$Xi][$Yi] != IGNORED)
+                {
+                $Value = $Value + $this->Points[$Xi][$Yi]; $Points++;
+                }
+            }
             }
-          }
 
-         if ( $Points != 0 ) { $this->Points[$X][$Y] = $Value / $Points; }
+            if ( $Points != 0 ) { $this->Points[$X][$Y] = $Value / $Points; }
+        }
         }
-      }
     }
 
-   /* Return the nearest Neighbor distance of a point */
-   function getNearestNeighbor($Xp,$Yp)
+    /* Return the nearest Neighbor distance of a point */
+    function getNearestNeighbor($Xp,$Yp)
     {
-     $Nearest = UNKNOWN;
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        $Nearest = UNKNOWN;
+        for($X=0;$X<=$this->GridSizeX;$X++)
+        {
+        for($Y=0;$Y<=$this->GridSizeY;$Y++)
         {
-         if ( $this->Points[$X][$Y] != UNKNOWN && $this->Points[$X][$Y] != IGNORED )
-          {
-           $DistanceX = max($Xp,$X)-min($Xp,$X);
-           $DistanceY = max($Yp,$Y)-min($Yp,$Y);
-           $Distance  = max($DistanceX,$DistanceY);
-           if ( $Distance < $Nearest || $Nearest == UNKNOWN ) { $Nearest = $Distance; }
-          }
+            if ( $this->Points[$X][$Y] != UNKNOWN && $this->Points[$X][$Y] != IGNORED )
+            {
+            $DistanceX = max($Xp,$X)-min($Xp,$X);
+            $DistanceY = max($Yp,$Y)-min($Yp,$Y);
+            $Distance  = max($DistanceX,$DistanceY);
+            if ( $Distance < $Nearest || $Nearest == UNKNOWN ) { $Nearest = $Distance; }
+            }
         }
-      }
-     return($Nearest);
+        }
+        return($Nearest);
+    }
     }
-  }
 ?>
\ No newline at end of file

drupal/sites/default/boinc/modules/boincteam/includes/views_handler_argument_boincteam_id.inc

Indentation +4 added lines, -4 removed lines

@@ -7,15 +7,15 @@
  */
 
 class views_handler_argument_boincteam_id extends views_handler_argument_numeric {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function set_argument($arg) {
+    function set_argument($arg) {
     // When setting the ID argument, convert to BOINC ID
     $id = is_numeric($arg) ? $arg : 0;
     $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = %d", $id));
     $this->argument = $boinc_id;
     return $this->validate_arg($boinc_id);
-  }
+    }
 }

drupal/sites/default/boinc/modules/boincteam/boincteam_forum.views.inc

Indentation +42 added lines, -42 removed lines

@@ -13,80 +13,80 @@
  */
 function boincteam_forum_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team table
+    // -----------------------------------------------------------------------------------------------
   
-  $data['boincteam_forum_node']['table']['group'] = t('BOINC');
+    $data['boincteam_forum_node']['table']['group'] = t('BOINC');
   
-  $data['boincteam_forum_node']['table']['base'] = array(
-      'field' => 'nid',
-      'title' => t('BOINC team forum topic'),
-      'help' => t('Forum topics for a team'),
-  );
+    $data['boincteam_forum_node']['table']['base'] = array(
+        'field' => 'nid',
+        'title' => t('BOINC team forum topic'),
+        'help' => t('Forum topics for a team'),
+    );
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
   
-  $data['boincteam_forum_node']['tfid'] = array(
+    $data['boincteam_forum_node']['tfid'] = array(
     'title' => t('Team forum ID'),
     'help' => t('The ID of the team forum containing this topic.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_numeric',
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_numeric',
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'boincteam_forum',
-      'field' => 'tfid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team Forum')
+        'base' => 'boincteam_forum',
+        'field' => 'tfid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team Forum')
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['boincteam_forum_node']['nid'] = array(
+    $data['boincteam_forum_node']['nid'] = array(
     'title' => t('Team forum node'),
     'help' => t('The node containing the content of this team forum topic.'),
     // This is a foreign key to the {node} table. When the view is configured
     // with this relationship, all the fields for the related user node will be 
     // available.
     'relationship' => array(
-      'base' => 'node',
-      'field' => 'nid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team Forum Topic Node')
+        'base' => 'node',
+        'field' => 'nid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team Forum Topic Node')
     ),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of general fields (alphabetized)
-  // ...
+    // Descriptions of general fields (alphabetized)
+    // ...
   
-  return $data;
+    return $data;
 }

drupal/sites/default/boinc/modules/boincwork/views/views_handler_argument_boincuser_id.inc

Indentation +4 added lines, -4 removed lines

@@ -7,15 +7,15 @@
  */
 
 class views_handler_argument_boincuser_id extends views_handler_argument_numeric {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function set_argument($arg) {
+    function set_argument($arg) {
     // When setting the ID argument, convert to BOINC ID
     $id = is_numeric($arg) ? $arg : 0;
     $boinc_id = db_result(db_query("SELECT boinc_id FROM {boincuser} WHERE uid = %d", $id));
     $this->argument = $boinc_id;
     return $this->validate_arg($boinc_id);
-  }
+    }
 }

drupal/sites/default/boinc/modules/boincwork/views/views_handler_field_boincwork_host_app_et_avg.inc

Indentation +5 added lines, -5 removed lines

@@ -6,15 +6,15 @@
  */
 
 class views_handler_field_boincwork_host_app_et_avg extends views_handler_field {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function render($values) {
+    function render($values) {
     $gflops = 0;
     if ($values->host_app_version_et_avg) {
-      $gflops = 1e-9 / $values->host_app_version_et_avg;
+        $gflops = 1e-9 / $values->host_app_version_et_avg;
     }
     return round($gflops, 2) . ' GFLOPS';
-  }
+    }
 }

drupal/sites/default/boinc/modules/boincwork/views/views_handler_field_boincwork_host_app_turnaround_avg.inc

Indentation +4 added lines, -4 removed lines

@@ -6,12 +6,12 @@
  */
 
 class views_handler_field_boincwork_host_app_turnaround_avg extends views_handler_field {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function render($values) {
+    function render($values) {
     $time_in_days = $values->host_app_version_turnaround_avg / (24*60*60);
     return round($time_in_days, 2) . ' ' . t('days');
-  }
+    }
 }

drupal/sites/default/boinc/modules/boincwork/views/views_handler_field_boincwork_app_version_number.inc

Indentation +4 added lines, -4 removed lines

@@ -6,11 +6,11 @@
  */
 
 class views_handler_field_boincwork_app_version_number extends views_handler_field {
-  function construct() {
+    function construct() {
     parent::construct();
-  }
+    }
 
-  function render($values) {
+    function render($values) {
     return sprintf("%01.2f", $values->app_version_host_app_version_version_num / 100);
-  }
+    }
 }