BOINC / boinc

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

Indentation +90 added lines, -90 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- /*
+    /*
      pSplit - class to draw spline splitted charts
 
      Version     : 2.1.3
@@ -13,119 +13,119 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("TEXT_POS_TOP"		, 690001);
- define("TEXT_POS_RIGHT"	, 690002);
+    define("TEXT_POS_TOP"		, 690001);
+    define("TEXT_POS_RIGHT"	, 690002);
 
- /* pSplit class definition */
- class pSplit
-  {
-   var $pChartObject;
+    /* pSplit class definition */
+    class pSplit
+    {
+    var $pChartObject;
 
-   /* Class creator */
-   function pSplit()
+    /* Class creator */
+    function pSplit()
     { }
 
-   /* Create the encoded string */
-   function drawSplitPath($Object,$Values,$Format="")
+    /* Create the encoded string */
+    function drawSplitPath($Object,$Values,$Format="")
     {
-     $this->pChartObject = $Object;
-
-     $Spacing		= isset($Format["Spacing"]) ? $Format["Spacing"] : 20;
-     $TextPadding	= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 2;
-     $TextPos		= isset($Format["TextPos"]) ? $Format["TextPos"] : TEXT_POS_TOP;
-     $Surrounding       = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Force		= isset($Format["Force"]) ? $Format["Force"] : 70;
-     $Segments		= isset($Format["Segments"]) ? $Format["Segments"] : 15;
-     $FontSize		= $Object->FontSize;
-     $X1		= $Object->GraphAreaX1;
-     $Y1		= $Object->GraphAreaY1;
-     $X2		= $Object->GraphAreaX2;
-     $Y2		= $Object->GraphAreaY2;
-
-     /* Data Processing */
-     $Data    = $Values->getData();
-     $Palette = $Values->getPalette();
-
-     $LabelSerie = $Data["Abscissa"];
-     $DataSerie  = "";
-
-     foreach($Data["Series"] as $SerieName => $Value)
-      { if ( $SerieName != $LabelSerie && $DataSerie == "" ) { $DataSerie = $SerieName; } }
-
-     $DataSerieSum   = array_sum($Data["Series"][$DataSerie]["Data"]);
-     $DataSerieCount = count($Data["Series"][$DataSerie]["Data"]);
-
-     /* Scale Processing */
-     if ( $TextPos == TEXT_POS_RIGHT )
-      $YScale     = (($Y2-$Y1) - (($DataSerieCount+1)*$Spacing)) / $DataSerieSum;
-     else
-      $YScale     = (($Y2-$Y1) - ($DataSerieCount*$Spacing)) / $DataSerieSum;
-     $LeftHeight = $DataSerieSum * $YScale;
-
-     /* Re-compute graph width depending of the text mode choosen */
-     if ( $TextPos == TEXT_POS_RIGHT )
-      {
-       $MaxWidth = 0;
-       foreach($Data["Series"][$LabelSerie]["Data"] as $Key => $Label)
+        $this->pChartObject = $Object;
+
+        $Spacing		= isset($Format["Spacing"]) ? $Format["Spacing"] : 20;
+        $TextPadding	= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 2;
+        $TextPos		= isset($Format["TextPos"]) ? $Format["TextPos"] : TEXT_POS_TOP;
+        $Surrounding       = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+        $Force		= isset($Format["Force"]) ? $Format["Force"] : 70;
+        $Segments		= isset($Format["Segments"]) ? $Format["Segments"] : 15;
+        $FontSize		= $Object->FontSize;
+        $X1		= $Object->GraphAreaX1;
+        $Y1		= $Object->GraphAreaY1;
+        $X2		= $Object->GraphAreaX2;
+        $Y2		= $Object->GraphAreaY2;
+
+        /* Data Processing */
+        $Data    = $Values->getData();
+        $Palette = $Values->getPalette();
+
+        $LabelSerie = $Data["Abscissa"];
+        $DataSerie  = "";
+
+        foreach($Data["Series"] as $SerieName => $Value)
+        { if ( $SerieName != $LabelSerie && $DataSerie == "" ) { $DataSerie = $SerieName; } }
+
+        $DataSerieSum   = array_sum($Data["Series"][$DataSerie]["Data"]);
+        $DataSerieCount = count($Data["Series"][$DataSerie]["Data"]);
+
+        /* Scale Processing */
+        if ( $TextPos == TEXT_POS_RIGHT )
+        $YScale     = (($Y2-$Y1) - (($DataSerieCount+1)*$Spacing)) / $DataSerieSum;
+        else
+        $YScale     = (($Y2-$Y1) - ($DataSerieCount*$Spacing)) / $DataSerieSum;
+        $LeftHeight = $DataSerieSum * $YScale;
+
+        /* Re-compute graph width depending of the text mode choosen */
+        if ( $TextPos == TEXT_POS_RIGHT )
+        {
+        $MaxWidth = 0;
+        foreach($Data["Series"][$LabelSerie]["Data"] as $Key => $Label)
         {
-         $Boundardies = $Object->getTextBox(0,0,$Object->FontName,$Object->FontSize,0,$Label);
-         if ( $Boundardies[1]["X"] > $MaxWidth ) { $MaxWidth = $Boundardies[1]["X"] + $TextPadding*2; }
+            $Boundardies = $Object->getTextBox(0,0,$Object->FontName,$Object->FontSize,0,$Label);
+            if ( $Boundardies[1]["X"] > $MaxWidth ) { $MaxWidth = $Boundardies[1]["X"] + $TextPadding*2; }
+        }
+        $X2 = $X2 - $MaxWidth;
         }
-       $X2 = $X2 - $MaxWidth;
-      }
 
-     /* Drawing */
-     $LeftY    = ((($Y2-$Y1) / 2) + $Y1) - ($LeftHeight/2);
-     $RightY   = $Y1;
-     $VectorX  = (($X2-$X1) / 2);
+        /* Drawing */
+        $LeftY    = ((($Y2-$Y1) / 2) + $Y1) - ($LeftHeight/2);
+        $RightY   = $Y1;
+        $VectorX  = (($X2-$X1) / 2);
 
-     foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
-      {
-       if ( isset($Data["Series"][$LabelSerie]["Data"][$Key]) )
+        foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+        {
+        if ( isset($Data["Series"][$LabelSerie]["Data"][$Key]) )
         $Label = $Data["Series"][$LabelSerie]["Data"][$Key];
-       else
+        else
         $Label = "-";
 
-       $LeftY1 = $LeftY;
-       $LeftY2 = $LeftY + $Value * $YScale;
+        $LeftY1 = $LeftY;
+        $LeftY2 = $LeftY + $Value * $YScale;
 
-       $RightY1 = $RightY + $Spacing;
-       $RightY2 = $RightY + $Spacing + $Value * $YScale;;
+        $RightY1 = $RightY + $Spacing;
+        $RightY2 = $RightY + $Spacing + $Value * $YScale;;
 
-       $Settings = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"],"NoDraw"=>TRUE,"Segments"=>$Segments,"Surrounding"=>$Surrounding);
+        $Settings = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"],"NoDraw"=>TRUE,"Segments"=>$Segments,"Surrounding"=>$Surrounding);
 
-       $PolyGon = "";
+        $PolyGon = "";
 
-       $Angle    = $Object->getAngle($X2,$RightY1,$X1,$LeftY1);
-       $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 + $X1;
-       $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
-       $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 + $X1;
-       $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
+        $Angle    = $Object->getAngle($X2,$RightY1,$X1,$LeftY1);
+        $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 + $X1;
+        $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
+        $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 + $X1;
+        $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
 
-       $Points = $Object->drawBezier($X1,$LeftY1,$X2,$RightY1,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
-       foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
+        $Points = $Object->drawBezier($X1,$LeftY1,$X2,$RightY1,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
+        foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
 
 
-       $Angle    = $Object->getAngle($X2,$RightY2,$X1,$LeftY2);
-       $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 +$X1;
-       $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
-       $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 +$X1;
-       $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
+        $Angle    = $Object->getAngle($X2,$RightY2,$X1,$LeftY2);
+        $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 +$X1;
+        $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
+        $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 +$X1;
+        $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
 
-       $Points = $Object->drawBezier($X1,$LeftY2,$X2,$RightY2,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
-       $Points = array_reverse($Points);
-       foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
+        $Points = $Object->drawBezier($X1,$LeftY2,$X2,$RightY2,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
+        $Points = array_reverse($Points);
+        foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
 
-       $Object->drawPolygon($PolyGon,$Settings);
+        $Object->drawPolygon($PolyGon,$Settings);
 
-       if ( $TextPos == TEXT_POS_RIGHT )
+        if ( $TextPos == TEXT_POS_RIGHT )
         $Object->drawText($X2+$TextPadding,($RightY2-$RightY1)/2+$RightY1,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
-       else
+        else
         $Object->drawText($X2,$RightY1-$TextPadding,$Label,array("Align"=>TEXT_ALIGN_BOTTOMRIGHT));
 
-       $LeftY  = $LeftY2;
-       $RightY = $RightY2;
-      }
+        $LeftY  = $LeftY2;
+        $RightY = $RightY2;
+        }
+    }
     }
-  }
 ?>
\ No newline at end of file

Spacing +41 added lines, -41 removed lines

@@ -13,8 +13,8 @@ 
      You can find the whole class documentation on the pChart web site.
  */
 
- define("TEXT_POS_TOP"		, 690001);
- define("TEXT_POS_RIGHT"	, 690002);
+ define("TEXT_POS_TOP", 690001);
+ define("TEXT_POS_RIGHT", 690002);
 
  /* pSplit class definition */
  class pSplit
@@ -26,15 +26,15 @@ 
     { }
 
    /* Create the encoded string */
-   function drawSplitPath($Object,$Values,$Format="")
+   function drawSplitPath($Object, $Values, $Format = "")
     {
      $this->pChartObject = $Object;
 
      $Spacing		= isset($Format["Spacing"]) ? $Format["Spacing"] : 20;
-     $TextPadding	= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 2;
+     $TextPadding = isset($Format["TextPadding"]) ? $Format["TextPadding"] : 2;
      $TextPos		= isset($Format["TextPos"]) ? $Format["TextPos"] : TEXT_POS_TOP;
-     $Surrounding       = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
-     $Force		= isset($Format["Force"]) ? $Format["Force"] : 70;
+     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Force = isset($Format["Force"]) ? $Format["Force"] : 70;
      $Segments		= isset($Format["Segments"]) ? $Format["Segments"] : 15;
      $FontSize		= $Object->FontSize;
      $X1		= $Object->GraphAreaX1;
@@ -49,79 +49,79 @@ 
      $LabelSerie = $Data["Abscissa"];
      $DataSerie  = "";
 
-     foreach($Data["Series"] as $SerieName => $Value)
-      { if ( $SerieName != $LabelSerie && $DataSerie == "" ) { $DataSerie = $SerieName; } }
+     foreach ($Data["Series"] as $SerieName => $Value)
+      { if ($SerieName != $LabelSerie && $DataSerie == "") { $DataSerie = $SerieName; } }
 
      $DataSerieSum   = array_sum($Data["Series"][$DataSerie]["Data"]);
      $DataSerieCount = count($Data["Series"][$DataSerie]["Data"]);
 
      /* Scale Processing */
-     if ( $TextPos == TEXT_POS_RIGHT )
-      $YScale     = (($Y2-$Y1) - (($DataSerieCount+1)*$Spacing)) / $DataSerieSum;
+     if ($TextPos == TEXT_POS_RIGHT)
+      $YScale     = (($Y2 - $Y1) - (($DataSerieCount + 1)*$Spacing))/$DataSerieSum;
      else
-      $YScale     = (($Y2-$Y1) - ($DataSerieCount*$Spacing)) / $DataSerieSum;
-     $LeftHeight = $DataSerieSum * $YScale;
+      $YScale     = (($Y2 - $Y1) - ($DataSerieCount*$Spacing))/$DataSerieSum;
+     $LeftHeight = $DataSerieSum*$YScale;
 
      /* Re-compute graph width depending of the text mode choosen */
-     if ( $TextPos == TEXT_POS_RIGHT )
+     if ($TextPos == TEXT_POS_RIGHT)
       {
        $MaxWidth = 0;
-       foreach($Data["Series"][$LabelSerie]["Data"] as $Key => $Label)
+       foreach ($Data["Series"][$LabelSerie]["Data"] as $Key => $Label)
         {
-         $Boundardies = $Object->getTextBox(0,0,$Object->FontName,$Object->FontSize,0,$Label);
-         if ( $Boundardies[1]["X"] > $MaxWidth ) { $MaxWidth = $Boundardies[1]["X"] + $TextPadding*2; }
+         $Boundardies = $Object->getTextBox(0, 0, $Object->FontName, $Object->FontSize, 0, $Label);
+         if ($Boundardies[1]["X"] > $MaxWidth) { $MaxWidth = $Boundardies[1]["X"] + $TextPadding*2; }
         }
        $X2 = $X2 - $MaxWidth;
       }
 
      /* Drawing */
-     $LeftY    = ((($Y2-$Y1) / 2) + $Y1) - ($LeftHeight/2);
+     $LeftY    = ((($Y2 - $Y1)/2) + $Y1) - ($LeftHeight/2);
      $RightY   = $Y1;
-     $VectorX  = (($X2-$X1) / 2);
+     $VectorX  = (($X2 - $X1)/2);
 
-     foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+     foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
       {
-       if ( isset($Data["Series"][$LabelSerie]["Data"][$Key]) )
+       if (isset($Data["Series"][$LabelSerie]["Data"][$Key]))
         $Label = $Data["Series"][$LabelSerie]["Data"][$Key];
        else
         $Label = "-";
 
        $LeftY1 = $LeftY;
-       $LeftY2 = $LeftY + $Value * $YScale;
+       $LeftY2 = $LeftY + $Value*$YScale;
 
        $RightY1 = $RightY + $Spacing;
-       $RightY2 = $RightY + $Spacing + $Value * $YScale;;
+       $RightY2 = $RightY + $Spacing + $Value*$YScale; ;
 
-       $Settings = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"],"NoDraw"=>TRUE,"Segments"=>$Segments,"Surrounding"=>$Surrounding);
+       $Settings = array("R"=>$Palette[$Key]["R"], "G"=>$Palette[$Key]["G"], "B"=>$Palette[$Key]["B"], "Alpha"=>$Palette[$Key]["Alpha"], "NoDraw"=>TRUE, "Segments"=>$Segments, "Surrounding"=>$Surrounding);
 
        $PolyGon = "";
 
-       $Angle    = $Object->getAngle($X2,$RightY1,$X1,$LeftY1);
-       $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 + $X1;
-       $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
-       $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 + $X1;
-       $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
+       $Angle    = $Object->getAngle($X2, $RightY1, $X1, $LeftY1);
+       $VectorX1 = cos(deg2rad($Angle + 90))*$Force + ($X2 - $X1)/2 + $X1;
+       $VectorY1 = sin(deg2rad($Angle + 90))*$Force + ($RightY1 - $LeftY1)/2 + $LeftY1;
+       $VectorX2 = cos(deg2rad($Angle - 90))*$Force + ($X2 - $X1)/2 + $X1;
+       $VectorY2 = sin(deg2rad($Angle - 90))*$Force + ($RightY1 - $LeftY1)/2 + $LeftY1;
 
-       $Points = $Object->drawBezier($X1,$LeftY1,$X2,$RightY1,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
-       foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
+       $Points = $Object->drawBezier($X1, $LeftY1, $X2, $RightY1, $VectorX1, $VectorY1, $VectorX2, $VectorY2, $Settings);
+       foreach ($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
 
 
-       $Angle    = $Object->getAngle($X2,$RightY2,$X1,$LeftY2);
-       $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 +$X1;
-       $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
-       $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 +$X1;
-       $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
+       $Angle    = $Object->getAngle($X2, $RightY2, $X1, $LeftY2);
+       $VectorX1 = cos(deg2rad($Angle + 90))*$Force + ($X2 - $X1)/2 + $X1;
+       $VectorY1 = sin(deg2rad($Angle + 90))*$Force + ($RightY2 - $LeftY2)/2 + $LeftY2;
+       $VectorX2 = cos(deg2rad($Angle - 90))*$Force + ($X2 - $X1)/2 + $X1;
+       $VectorY2 = sin(deg2rad($Angle - 90))*$Force + ($RightY2 - $LeftY2)/2 + $LeftY2;
 
-       $Points = $Object->drawBezier($X1,$LeftY2,$X2,$RightY2,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
+       $Points = $Object->drawBezier($X1, $LeftY2, $X2, $RightY2, $VectorX1, $VectorY1, $VectorX2, $VectorY2, $Settings);
        $Points = array_reverse($Points);
-       foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
+       foreach ($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
 
-       $Object->drawPolygon($PolyGon,$Settings);
+       $Object->drawPolygon($PolyGon, $Settings);
 
-       if ( $TextPos == TEXT_POS_RIGHT )
-        $Object->drawText($X2+$TextPadding,($RightY2-$RightY1)/2+$RightY1,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+       if ($TextPos == TEXT_POS_RIGHT)
+        $Object->drawText($X2 + $TextPadding, ($RightY2 - $RightY1)/2 + $RightY1, $Label, array("Align"=>TEXT_ALIGN_MIDDLELEFT));
        else
-        $Object->drawText($X2,$RightY1-$TextPadding,$Label,array("Align"=>TEXT_ALIGN_BOTTOMRIGHT));
+        $Object->drawText($X2, $RightY1 - $TextPadding, $Label, array("Align"=>TEXT_ALIGN_BOTTOMRIGHT));
 
        $LeftY  = $LeftY2;
        $RightY = $RightY2;

Braces +5 added lines, -10 removed lines

@@ -17,8 +17,7 @@ 
  define("TEXT_POS_RIGHT"	, 690002);
 
  /* pSplit class definition */
- class pSplit
-  {
+ class pSplit {
    var $pChartObject;
 
    /* Class creator */
@@ -26,8 +25,7 @@ 
     { }
 
    /* Create the encoded string */
-   function drawSplitPath($Object,$Values,$Format="")
-    {
+   function drawSplitPath($Object,$Values,$Format="") {
      $this->pChartObject = $Object;
 
      $Spacing		= isset($Format["Spacing"]) ? $Format["Spacing"] : 20;
@@ -63,11 +61,9 @@ 
      $LeftHeight = $DataSerieSum * $YScale;
 
      /* Re-compute graph width depending of the text mode choosen */
-     if ( $TextPos == TEXT_POS_RIGHT )
-      {
+     if ( $TextPos == TEXT_POS_RIGHT ) {
        $MaxWidth = 0;
-       foreach($Data["Series"][$LabelSerie]["Data"] as $Key => $Label)
-        {
+       foreach($Data["Series"][$LabelSerie]["Data"] as $Key => $Label) {
          $Boundardies = $Object->getTextBox(0,0,$Object->FontName,$Object->FontSize,0,$Label);
          if ( $Boundardies[1]["X"] > $MaxWidth ) { $MaxWidth = $Boundardies[1]["X"] + $TextPadding*2; }
         }
@@ -79,8 +75,7 @@ 
      $RightY   = $Y1;
      $VectorX  = (($X2-$X1) / 2);
 
-     foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
-      {
+     foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value) {
        if ( isset($Data["Series"][$LabelSerie]["Data"][$Key]) )
         $Label = $Data["Series"][$LabelSerie]["Data"][$Key];
        else

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
      $Spacing		= isset($Format["Spacing"]) ? $Format["Spacing"] : 20;
      $TextPadding	= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 2;
      $TextPos		= isset($Format["TextPos"]) ? $Format["TextPos"] : TEXT_POS_TOP;
-     $Surrounding       = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Surrounding       = isset($Format["Surrounding"]) ? $Format["Surrounding"] : null;
      $Force		= isset($Format["Force"]) ? $Format["Force"] : 70;
      $Segments		= isset($Format["Segments"]) ? $Format["Segments"] : 15;
      $FontSize		= $Object->FontSize;
@@ -92,7 +92,7 @@ 
        $RightY1 = $RightY + $Spacing;
        $RightY2 = $RightY + $Spacing + $Value * $YScale;;
 
-       $Settings = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"],"NoDraw"=>TRUE,"Segments"=>$Segments,"Surrounding"=>$Surrounding);
+       $Settings = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"],"NoDraw"=>true,"Segments"=>$Segments,"Surrounding"=>$Surrounding);
 
        $PolyGon = "";
 

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

Spacing +87 added lines, -87 removed lines

@@ -13,7 +13,7 @@ 
      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
@@ -22,82 +22,82 @@ 
    var $pDataObject;
 
    /* Class creator */
-   function pStock($pChartObject,$pDataObject)
+   function pStock($pChartObject, $pDataObject)
     {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Draw a stock chart */
-   function drawStockChart($Format="")
+   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;
+     $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;
+     $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;
+     $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;
+     $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;
+     $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";
+     $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 ($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;
+     if ($LineWidth != 1) { $LineOffset = $LineWidth/2; }
+     $BoxOffset = $BoxWidth/2;
 
      $Data = $this->pChartObject->DataSet->getData();
-     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+     list($XMargin, $XDivs) = $this->pChartObject->scaleGetXSettings();
 
-     if ( !isset($Data["Series"][$SerieOpen]) || !isset($Data["Series"][$SerieClose]) || !isset($Data["Series"][$SerieMin]) || !isset($Data["Series"][$SerieMax]) )
+     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)
+     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 (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]))
         $Point[] = $Data["Series"][$SerieMedian]["Data"][$Key];
 
        $Plots[] = $Point;
@@ -108,105 +108,105 @@ 
      $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;
 
-     $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)
+     foreach ($Plots as $Key =>$Points)
       {
-       $PosArray = $this->pChartObject->scaleComputeY($Points,array("AxisID"=>$AxisID));
+       $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); } 
+       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);
+         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);
+          $this->pChartObject->drawFilledRectangle($X - $LineOffset, $PosArray[2], $X + $LineOffset, $PosArray[3], $LineSettings);
 
-         if ( $ExtremityWidth == 1 )
+         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);
+           $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); }
+           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);
+           $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);
+         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);
+          $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;
         }
-       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);
+         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);
+          $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 )
+         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);
+           $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); }
+           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);
+           $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);
+         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);
+          $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;
         }

Braces +11 added lines, -25 removed lines

@@ -16,21 +16,18 @@ 
  define("STOCK_MISSING_SERIE"	, 180001);
 
  /* pStock class definition */
- class pStock
-  {
+ class pStock {
    var $pChartObject;
    var $pDataObject;
 
    /* Class creator */
-   function pStock($pChartObject,$pDataObject)
-    {
+   function pStock($pChartObject,$pDataObject) {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Draw a stock chart */
-   function drawStockChart($Format="")
-    {
+   function drawStockChart($Format="") {
      $SerieOpen		= isset($Format["SerieOpen"]) ? $Format["SerieOpen"] : "Open";
      $SerieClose	= isset($Format["SerieClose"]) ? $Format["SerieClose"] : "Close";
      $SerieMin		= isset($Format["SerieMin"]) ? $Format["SerieMin"] : "Min";
@@ -92,8 +89,7 @@ 
       return(STOCK_MISSING_SERIE);
 
      $Plots = "";
-     foreach($Data["Series"][$SerieOpen]["Data"] as $Key => $Value)
-      {
+     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]);
@@ -120,16 +116,14 @@ 
      $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)
-      {
+     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); } 
 
-       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; }
 
@@ -142,15 +136,12 @@ 
          else
           $this->pChartObject->drawFilledRectangle($X-$LineOffset,$PosArray[2],$X+$LineOffset,$PosArray[3],$LineSettings);
 
-         if ( $ExtremityWidth == 1 )
-          {
+         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
-          {
+          } 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);
 
@@ -168,9 +159,7 @@ 
           $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[4],$X+$ExtremityLength,$PosArray[4],$MedianSettings);
 
          $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; }
 
@@ -183,15 +172,12 @@ 
 
          if ( $ShadowOnBoxesOnly ) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
 
-         if ( $ExtremityWidth == 1 )
-          {
+         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
-          {
+          } 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);
 

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -35,7 +35,7 @@ 
      $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;
+     $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;
@@ -52,7 +52,7 @@ 
      $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;
+     $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;
@@ -61,17 +61,17 @@ 
      $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;
+     $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;
+     $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;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : false;
      $ImageMapTitle	= isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : "Stock Chart";
 
 
@@ -79,8 +79,8 @@ 
      $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 ( $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;
@@ -97,7 +97,7 @@ 
        $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;
@@ -125,7 +125,7 @@ 
        $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 ( $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 )
@@ -135,7 +135,7 @@ 
 
          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);
@@ -181,7 +181,7 @@ 
          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 )
           {

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

Spacing +114 added lines, -114 removed lines

@@ -13,13 +13,13 @@ 
      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
@@ -38,159 +38,159 @@ 
     }
 
    /* Define the grid size and initialise the 2D matrix */
-   function setGrid($XSize=10,$YSize=10)
+   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;
     }
 
    /* Add a point on the grid */
-   function addPoint($X,$Y,$Value,$Force=TRUE)
+   function addPoint($X, $Y, $Value, $Force = TRUE)
     {
-     if ( $X < 0 || $X >$this->GridSizeX ) { return(0); }
-     if ( $Y < 0 || $Y >$this->GridSizeY ) { return(0); }
+     if ($X < 0 || $X > $this->GridSizeX) { return(0); }
+     if ($Y < 0 || $Y > $this->GridSizeY) { return(0); }
 
-     if ( $this->Points[$X][$Y] == UNKNOWN || $Force )
+     if ($this->Points[$X][$Y] == UNKNOWN || $Force)
       $this->Points[$X][$Y] = $Value;
-     elseif ( $this->Points[$X][$Y] == UNKNOWN )
+     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="")
+   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;
+     $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; }
+     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);
+     $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 )
+     $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; }
+       $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 )
+     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; }
+       $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++)
+     for ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       $XPos = floor($X0+$X*$XSize + $XSize/2);
+       $XPos = floor($X0 + $X*$XSize + $XSize/2);
 
-       if( $Labels == NULL || !isset($Labels[$X]) )
-        $Value = $X+$CountOffset;
+       if ($Labels == NULL || !isset($Labels[$X]))
+        $Value = $X + $CountOffset;
        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="")
+   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;
+     $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; }
+     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);
+     $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 )
+     $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 )
+     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++)
+     for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
       {
-       $YPos = floor($Y0+$Y*$YSize + $YSize/2);
+       $YPos = floor($Y0 + $Y*$YSize + $YSize/2);
 
-       if( $Labels == NULL || !isset($Labels[$Y]) )
-        $Value = $Y+$CountOffset;
+       if ($Labels == NULL || !isset($Labels[$Y]))
+        $Value = $Y + $CountOffset;
        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="")
+   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;
+     $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);
+     $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);
+     $Color = array("R"=>$R, "G"=>$G, "B"=>$B, "Alpha"=>$Alpha, "Ticks"=>$Ticks);
 
-     for($X=0;$X<=$this->GridSizeX;$X++)
+     for ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+       for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
         {
          $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED && $Value >= $Threshold)
+         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)
-            $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)
-            $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)
-            $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)
-            $this->pChartObject->drawLine($X1,$Y2,$X2,$Y2,$Color);
+           $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)
+            $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)
+            $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)
+            $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)
+            $this->pChartObject->drawLine($X1, $Y2, $X2, $Y2, $Color);
           }
         }
       }
     }
 
    /* Draw the surface chart */
-   function drawSurface($Format="")
+   function drawSurface($Format = "")
     {
      $Palette		= isset($Format["Palette"]) ? $Format["Palette"] : NULL;
      $ShadeR1		= isset($Format["ShadeR1"]) ? $Format["ShadeR1"] : 77;
@@ -201,51 +201,51 @@ 
      $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;
+     $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;
+     $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);
+     $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 ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+       for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
         {
          $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED )
+         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);
+           $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
             {
-             $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);
           }
         }
       }
@@ -255,57 +255,57 @@ 
    function computeMissing()
     {
      $Missing = "";
-     for($X=0;$X<=$this->GridSizeX;$X++)
+     for ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+       for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
         {
-         if ( $this->Points[$X][$Y] == UNKNOWN )
+         if ($this->Points[$X][$Y] == UNKNOWN)
           $Missing[] = $X.",".$Y;
         }
       }
      shuffle($Missing);
      
-     foreach($Missing as $Key => $Pos)
+     foreach ($Missing as $Key => $Pos)
       {
-       $Pos = preg_split("/,/",$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 ($Xi = $X - $NearestNeighbor; $Xi <= $X + $NearestNeighbor; $Xi++)
           {
-           for($Yi=$Y-$NearestNeighbor;$Yi<=$Y+$NearestNeighbor;$Yi++)
+           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)
+             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)
+   function getNearestNeighbor($Xp, $Yp)
     {
      $Nearest = UNKNOWN;
-     for($X=0;$X<=$this->GridSizeX;$X++)
+     for ($X = 0; $X <= $this->GridSizeX; $X++)
       {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+       for ($Y = 0; $Y <= $this->GridSizeY; $Y++)
         {
-         if ( $this->Points[$X][$Y] != UNKNOWN && $this->Points[$X][$Y] != IGNORED )
+         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; }
+           $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; }
           }
         }
       }

Braces +35 added lines, -72 removed lines

@@ -22,24 +22,21 @@ 
  define("LABEL_POSITION_BOTTOM"	, 880004);
 
  /* pStock class definition */
- class pSurface
-  {
+ class pSurface {
    var $pChartObject;
    var $GridSizeX;
    var $GridSizeY;
    var $Points;
 
    /* Class creator */
-   function pSurface($pChartObject)
-    {
+   function pSurface($pChartObject) {
      $this->pChartObject = $pChartObject;
      $this->GridSize     = 10;
      $this->Points       = "";
     }
 
    /* Define the grid size and initialise the 2D matrix */
-   function setGrid($XSize=10,$YSize=10)
-    {
+   function setGrid($XSize=10,$YSize=10) {
      for($X=0; $X<=$XSize; $X++) { for($Y=0; $Y<=$YSize; $Y++) { $this->Points[$X][$Y]=UNKNOWN; } } 
 
      $this->GridSizeX = $XSize;
@@ -47,8 +44,7 @@ 
     }
 
    /* Add a point on the grid */
-   function addPoint($X,$Y,$Value,$Force=TRUE)
-    {
+   function addPoint($X,$Y,$Value,$Force=TRUE) {
      if ( $X < 0 || $X >$this->GridSizeX ) { return(0); }
      if ( $Y < 0 || $Y >$this->GridSizeY ) { return(0); }
 
@@ -61,8 +57,7 @@ 
     }
 
    /* Write the X labels */
-   function writeXLabels($Format="")
-    {
+   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;
@@ -79,23 +74,18 @@ 
      $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 )
-      {
+     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 )
-      {
+      } 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
+      } else
       return(-1);
 
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
+     for($X=0;$X<=$this->GridSizeX;$X++) {
        $XPos = floor($X0+$X*$XSize + $XSize/2);
 
        if( $Labels == NULL || !isset($Labels[$X]) )
@@ -108,8 +98,7 @@ 
     }
 
    /* Write the Y labels */
-   function writeYLabels($Format="")
-    {
+   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;
@@ -127,14 +116,11 @@ 
 
      $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
+      { $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++)
-      {
+     for($Y=0;$Y<=$this->GridSizeY;$Y++) {
        $YPos = floor($Y0+$Y*$YSize + $YSize/2);
 
        if( $Labels == NULL || !isset($Labels[$Y]) )
@@ -147,8 +133,7 @@ 
     }
 
    /* Draw the area arround the specified Threshold */
-   function drawContour($Threshold,$Format="")
-    {
+   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;
@@ -163,14 +148,11 @@ 
 
      $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++)
-        {
+     for($X=0;$X<=$this->GridSizeX;$X++) {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++) {
          $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED && $Value >= $Threshold)
-          {
+         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);
@@ -190,8 +172,7 @@ 
     }
 
    /* Draw the surface chart */
-   function drawSurface($Format="")
-    {
+   function drawSurface($Format="") {
      $Palette		= isset($Format["Palette"]) ? $Format["Palette"] : NULL;
      $ShadeR1		= isset($Format["ShadeR1"]) ? $Format["ShadeR1"] : 77;
      $ShadeG1		= isset($Format["ShadeG1"]) ? $Format["ShadeG1"] : 205;
@@ -213,28 +194,22 @@ 
      $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++)
-        {
+     for($X=0;$X<=$this->GridSizeX;$X++) {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++) {
          $Value = $this->Points[$X][$Y];
 
-         if ( $Value != UNKNOWN && $Value != IGNORED )
-          {
+         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; }
-            }
-           else
-            {
+            } else {
              $R = (($ShadeR2-$ShadeR1)/100)*$Value + $ShadeR1;
              $G = (($ShadeG2-$ShadeG1)/100)*$Value + $ShadeG1;
              $B = (($ShadeB2-$ShadeB1)/100)*$Value + $ShadeB1;
@@ -252,36 +227,28 @@ 
     }
 
    /* Compute the missing points */
-   function computeMissing()
-    {
+   function computeMissing() {
      $Missing = "";
-     for($X=0;$X<=$this->GridSizeX;$X++)
-      {
-       for($Y=0;$Y<=$this->GridSizeY;$Y++)
-        {
+     for($X=0;$X<=$this->GridSizeX;$X++) {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++) {
          if ( $this->Points[$X][$Y] == UNKNOWN )
           $Missing[] = $X.",".$Y;
         }
       }
      shuffle($Missing);
      
-     foreach($Missing as $Key => $Pos)
-      {
+     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);
 
          $Value = 0; $Points = 0;
-         for($Xi=$X-$NearestNeighbor;$Xi<=$X+$NearestNeighbor;$Xi++)
-          {
-           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)
-              {
+         for($Xi=$X-$NearestNeighbor;$Xi<=$X+$NearestNeighbor;$Xi++) {
+           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++;
               }
             }
@@ -293,15 +260,11 @@ 
     }
 
    /* Return the nearest Neighbor distance of a point */
-   function getNearestNeighbor($Xp,$Yp)
-    {
+   function getNearestNeighbor($Xp,$Yp) {
      $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 )
-          {
+     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);

Upper-Lower-Casing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
     }
 
    /* Add a point on the grid */
-   function addPoint($X,$Y,$Value,$Force=TRUE)
+   function addPoint($X,$Y,$Value,$Force=true)
     {
      if ( $X < 0 || $X >$this->GridSizeX ) { return(0); }
      if ( $Y < 0 || $Y >$this->GridSizeY ) { return(0); }
@@ -70,10 +70,10 @@ 
      $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;
+     $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; }
+     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);
@@ -98,7 +98,7 @@ 
       {
        $XPos = floor($X0+$X*$XSize + $XSize/2);
 
-       if( $Labels == NULL || !isset($Labels[$X]) )
+       if( $Labels == null || !isset($Labels[$X]) )
         $Value = $X+$CountOffset;
        else
         $Value = $Labels[$X];
@@ -117,10 +117,10 @@ 
      $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;
+     $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; }
+     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);
@@ -137,7 +137,7 @@ 
       {
        $YPos = floor($Y0+$Y*$YSize + $YSize/2);
 
-       if( $Labels == NULL || !isset($Labels[$Y]) )
+       if( $Labels == null || !isset($Labels[$Y]) )
         $Value = $Y+$CountOffset;
        else
         $Value = $Labels[$Y];
@@ -192,7 +192,7 @@ 
    /* Draw the surface chart */
    function drawSurface($Format="")
     {
-     $Palette		= isset($Format["Palette"]) ? $Format["Palette"] : NULL;
+     $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;
@@ -201,7 +201,7 @@ 
      $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;
+     $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;
@@ -226,7 +226,7 @@ 
            $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; }

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;
 }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -37,12 +37,12 @@ 
     'help' => t('The ID of the team forum containing this topic.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_numeric',
       'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -75,7 +75,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'

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

Spacing +1 added lines, -1 removed lines

@@ -444,7 +444,7 @@
 function boincteam_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincteam') . '/views',
+      'path' => drupal_get_path('module', 'boincteam').'/views',
     ),
     'handlers' => array(
       'views_handler_argument_boincteam_id' => array(

Upper-Lower-Casing +39 added lines, -39 removed lines

@@ -49,16 +49,16 @@ 
   // Primary keys allowed as arguments
   
   $data['team']['id'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+    'title' => bts('Team ID', array(), null, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id', // custom handler
       'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -79,7 +79,7 @@ 
   // Foreign key fields
   
   $data['team']['userid'] = array(
-    'title' => bts('Founder', array(), NULL, 'boinc:view-team-info'),
+    'title' => bts('Founder', array(), null, 'boinc:view-team-info'),
     'help' => t('The founder of this team.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be 
@@ -87,7 +87,7 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_boincuser_id',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -98,7 +98,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -141,11 +141,11 @@ 
   */
    
   $data['team']['country'] = array(
-    'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+    'title' => bts('Country', array(), null, 'boinc:country-of-origin'),
     'help' => t('The country of a team.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -155,12 +155,12 @@ 
     )
   );
   $data['team']['expavg_credit'] = array(
-    'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
+    'title' => bts('Recent average credit', array(), null, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of team credit per day.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -170,11 +170,11 @@ 
     )
   );
   $data['team']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
+    'title' => bts('Name', array(), null, 'boinc:user-or-team-name'),
     'help' => t('The name of the team.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -184,11 +184,11 @@ 
     )
   );
   $data['team']['nusers'] = array(
-    'title' => bts('Members', array(), NULL, 'boinc:team-members'),
+    'title' => bts('Members', array(), null, 'boinc:team-members'),
     'help' => t('Count of team members.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -198,12 +198,12 @@ 
     )
   );
   $data['team']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
+    'title' => bts('Total credit', array(), null, 'boinc:user-or-team-total-credits'),
     'help' => t('The total team accumulated BOINC credit.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -249,16 +249,16 @@ 
   // Primary keys allowed as arguments
   
   $data['team_admin']['teamid'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+    'title' => bts('Team ID', array(), null, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team on which this user is an admin.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id', // custom handler
       'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
@@ -278,7 +278,7 @@ 
   // Foreign key fields
   
   $data['team_admin']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+    'title' => bts('User ID', array(), null, 'boinc:user-details'),
     'help' => t('The user that is a team admin.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be 
@@ -286,18 +286,18 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'relationship' => array(
       'base' => 'user',
       'field' => 'userid',
       'handler' => 'views_handler_relationship',
-      'label' => bts('User', array(), NULL, 'boinc:user-on-team')
+      'label' => bts('User', array(), null, 'boinc:user-on-team')
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -310,11 +310,11 @@ 
   // Descriptions of general fields (alphabetized)
   
   $data['team_admin']['create_time'] = array(
-    'title' => bts('Admin since', array(), NULL, 'boinc:team-when-user-became-an-admin'),
+    'title' => bts('Admin since', array(), null, 'boinc:team-when-user-became-an-admin'),
     'help' => t('When the BOINC user became a team admin.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -338,7 +338,7 @@ 
   // Primary keys allowed as arguments
   
   $data['team_delta']['teamid'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+    'title' => bts('Team ID', array(), null, 'boinc:team-id'),
     'help' => t('The team ID for this team history event.'),
     // This is a foreign key to the {team} table. When the view is configured
     // with this relationship, all the fields for the related user node will be 
@@ -346,12 +346,12 @@ 
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id',
       'name field' => 'title',
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -364,7 +364,7 @@ 
   // Foreign key fields
   
   $data['team_delta']['userid'] = array(
-    'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
+    'title' => bts('User ID', array(), null, 'boinc:user-details'),
     'help' => t('The user for this team history event.'),
     'relationship' => array(
       'base' => 'user',
@@ -374,7 +374,7 @@ 
     ),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -387,11 +387,11 @@ 
   // Descriptions of general fields (alphabetized)
   
   $data['team_delta']['joining'] = array(
-    'title' => bts('User joined', array(), NULL, 'boinc:user-joined-or-leaving-team'),
+    'title' => bts('User joined', array(), null, 'boinc:user-joined-or-leaving-team'),
     'help' => t('Whether the event is the user joining the team or leaving.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -401,11 +401,11 @@ 
     )
   );
   $data['team_delta']['timestamp'] = array(
-    'title' => bts('Timestamp', array(), NULL, 'boinc:team-history-timestamp'),
+    'title' => bts('Timestamp', array(), null, 'boinc:team-history-timestamp'),
     'help' => t('When the BOINC team history event took place.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -415,13 +415,13 @@ 
     )
   );
   $data['team_delta']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'user-or-team-total-credits'),
+    'title' => bts('Total credit', array(), null, 'user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit of the user when the
       history event took place.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'

Indentation +206 added lines, -206 removed lines

@@ -13,103 +13,103 @@ 
  */
 function boincteam_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team table
+    // -----------------------------------------------------------------------------------------------
   
-  $data['team']['table']['group'] = t('BOINC');
+    $data['team']['table']['group'] = t('BOINC');
   
-  $data['team']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC team'),
-      'help' => t('BOINC data for a team'),
-      'database' => 'boinc_rw'
-  );
+    $data['team']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC team'),
+        'help' => t('BOINC data for a team'),
+        'database' => 'boinc_rw'
+    );
   
-  // This table references the {user} table.
-  // This join creates an 'implicit' relationship to the user table, so that when
-  // "User" is the base table, the fields are automatically available.
+    // This table references the {user} table.
+    // This join creates an 'implicit' relationship to the user table, so that when
+    // "User" is the base table, the fields are automatically available.
   
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+    // Index this array by the table name to which this table refers.
+    // 'left_field' is the primary key in the referenced table.
+    // 'field' is the foreign key in this table.
   
-  $data['team']['table']['join'] = array(
+    $data['team']['table']['join'] = array(
     'user' => array(
-      'left_field' => 'id',
-      'field' => 'userid',
+        'left_field' => 'id',
+        'field' => 'userid',
     ),
-  );
+    );
 
-  // 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['team']['id'] = array(
+    $data['team']['id'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'team_delta',
-      'field' => 'id',
-      'base field' => 'teamid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team History')
+        'base' => 'team_delta',
+        'field' => 'id',
+        'base field' => 'teamid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team History')
     ),
     '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['team']['userid'] = array(
+    $data['team']['userid'] = array(
     'title' => bts('Founder', array(), NULL, 'boinc:view-team-info'),
     'help' => t('The founder of this team.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be 
     // available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincuser_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     ),
     '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)
+    /*
   $data['team']['create_time'] = array(
     'title' => bts('Team established', array(), NULL, 'boinc:date-team-established'),
     'help' => t('When the BOINC team was created.'),
@@ -140,298 +140,298 @@ 
   );
   */
    
-  $data['team']['country'] = array(
+    $data['team']['country'] = array(
     'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     'help' => t('The country of a team.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['team']['expavg_credit'] = array(
+    );
+    $data['team']['expavg_credit'] = array(
     'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of team credit per day.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => 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'
     )
-  );
-  $data['team']['name'] = array(
+    );
+    $data['team']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
     'help' => t('The name of the team.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['team']['nusers'] = array(
+    );
+    $data['team']['nusers'] = array(
     'title' => bts('Members', array(), NULL, 'boinc:team-members'),
     'help' => t('Count of team members.'),
     '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'
     )
-  );
-  $data['team']['total_credit'] = array(
+    );
+    $data['team']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
     'help' => t('The total team accumulated BOINC credit.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => 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'
     )
-  );
+    );
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team_admin table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team_admin table
+    // -----------------------------------------------------------------------------------------------
   
-  $data['team_admin']['table']['group'] = t('BOINC');
+    $data['team_admin']['table']['group'] = t('BOINC');
   
-  $data['team_admin']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC team admins'),
-      'help' => t('BOINC admins for a team'),
-      'database' => 'boinc_rw'
-  );
+    $data['team_admin']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC team admins'),
+        'help' => t('BOINC admins for a team'),
+        'database' => 'boinc_rw'
+    );
   
-  // This table references the {team} table.
-  // This join creates an 'implicit' relationship to the team table, so that when
-  // "Team" is the base table, the fields are automatically available.
+    // This table references the {team} table.
+    // This join creates an 'implicit' relationship to the team table, so that when
+    // "Team" is the base table, the fields are automatically available.
   
-  // Index this array by the table name to which this table refers.
-  // 'left_field' is the primary key in the referenced table.
-  // 'field' is the foreign key in this table.
+    // Index this array by the table name to which this table refers.
+    // 'left_field' is the primary key in the referenced table.
+    // 'field' is the foreign key in this table.
   
-  $data['team_admin']['table']['join'] = array(
+    $data['team_admin']['table']['join'] = array(
     'team' => array(
-      'left_field' => 'id',
-      'field' => 'teamid',
+        'left_field' => 'id',
+        'field' => 'teamid',
     ),
-  );
+    );
 
-  // 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['team_admin']['teamid'] = array(
+    $data['team_admin']['teamid'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The BOINC ID of the team on which this user is an admin.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'team',
-      'field' => 'teamid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('Team')
+        'base' => 'team',
+        'field' => 'teamid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('Team')
     ),
     '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['team_admin']['userid'] = array(
+    $data['team_admin']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The user that is a team admin.'),
     // This is a foreign key to the {user} table. When the view is configured
     // with this relationship, all the fields for the related user node will be 
     // available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => bts('User', array(), NULL, 'boinc:user-on-team')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => bts('User', array(), NULL, 'boinc:user-on-team')
     ),
     '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)
   
-  $data['team_admin']['create_time'] = array(
+    $data['team_admin']['create_time'] = array(
     'title' => bts('Admin since', array(), NULL, 'boinc:team-when-user-became-an-admin'),
     'help' => t('When the BOINC user became a team admin.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
+    );
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for team_delta table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for team_delta table
+    // -----------------------------------------------------------------------------------------------
   
-  $data['team_delta']['table']['group'] = t('BOINC');
+    $data['team_delta']['table']['group'] = t('BOINC');
 
-  // 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['team_delta']['teamid'] = array(
+    $data['team_delta']['teamid'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The team ID for this team history event.'),
     // This is a foreign key to the {team} table. When the view is configured
     // with this relationship, all the fields for the related user node will be 
     // available.
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id',
-      'name field' => 'title',
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id',
+        'name field' => 'title',
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     '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'
     )
-  );
+    );
   
-  // Foreign key fields
+    // Foreign key fields
   
-  $data['team_delta']['userid'] = array(
+    $data['team_delta']['userid'] = array(
     'title' => bts('User ID', array(), NULL, 'boinc:user-details'),
     'help' => t('The user for this team history event.'),
     'relationship' => array(
-      'base' => 'user',
-      'field' => 'userid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User')
+        'base' => 'user',
+        'field' => 'userid',
+        'handler' => 'views_handler_relationship',
+        'label' => t('User')
     ),
     '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)
   
-  $data['team_delta']['joining'] = array(
+    $data['team_delta']['joining'] = array(
     'title' => bts('User joined', array(), NULL, 'boinc:user-joined-or-leaving-team'),
     'help' => t('Whether the event is the user joining the team or leaving.'),
     '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'
     )
-  );
-  $data['team_delta']['timestamp'] = array(
+    );
+    $data['team_delta']['timestamp'] = array(
     'title' => bts('Timestamp', array(), NULL, 'boinc:team-history-timestamp'),
     'help' => t('When the BOINC team history event took place.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['team_delta']['total_credit'] = array(
+    );
+    $data['team_delta']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit of the user when the
       history event took place.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => 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'
     )
-  ); 
+    ); 
   
-  return $data;
+    return $data;
 }
 
 /*
@@ -442,14 +442,14 @@ 
  */
 
 function boincteam_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincteam') . '/views',
+        'path' => drupal_get_path('module', 'boincteam') . '/views',
     ),
     'handlers' => array(
-      'views_handler_argument_boincteam_id' => array(
+        'views_handler_argument_boincteam_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      )
+        )
     )
-  );
+    );
 }

drupal/sites/default/boinc/modules/boincwork/boincwork.admin.inc

Spacing +30 added lines, -30 removed lines

@@ -65,15 +65,15 @@ 
   */
 function boincwork_admin_prefs_upload_form_validate($form, &$form_state) {
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+  $xsd = './'.drupal_get_path('module', 'boincwork').'/includes/projectprefs.xsd';
   libxml_use_internal_errors(true);
   $xml = new DomDocument();
   $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
   if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $form_state['values']['prefs_xml']);
-    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+    drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}".
+      ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), 'error');
     form_set_error('upload', t('XML file failed validation'));
   }
 }
@@ -101,7 +101,7 @@ 
       "{$path}/minimum" => t('Minimum')
     );
     variable_set('jump_use_js_presets-Array', 1);
-    drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+    drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
     $output .= '<div class="simple-form-controls"><div class="form-item venue">';
     $output .= '<label>Preset:</label>';
     $output .= jump_quickly($preset_options, 'presets');
@@ -150,7 +150,7 @@ 
     '#type' => 'submit',
     '#value' => t('Save configuration')
   );
-  $form['saveuseconfigxml'] = array (
+  $form['saveuseconfigxml'] = array(
       '#type' => 'submit',
       '#value' => t('Save configuration with disk usage settings from config.xml'),
       '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
@@ -175,33 +175,33 @@ 
   // Verify all non-boolean user input values and notify form API of failures
   
   // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for')." \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for')." \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for')." \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for')." \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for')." \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for')." \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for')." \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for')." \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
 
   // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for')." \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for')." \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for')." \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for')." \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for')." \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for')." \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
+  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for')." \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
 
   // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for')." \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for')." \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for')." \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for')." \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for')." \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for')." \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for')." \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for')." \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
 }
 
 /**
@@ -217,7 +217,7 @@ 
   // Processing preferences
   $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
   $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
-  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
+  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0 : 1;
   $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
   $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
   $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
@@ -267,7 +267,7 @@ 
   
   // Get the full configuration
   $all_presets = boincwork_get_preset_prefs();
-  $all_presets = (array) $all_presets['general_preferences'];
+  $all_presets = (array)$all_presets['general_preferences'];
   
   // Check for sane config
   if (isset($all_presets['preset'])) {

Indentation +168 added lines, -168 removed lines

@@ -10,80 +10,80 @@ 
  * Allow configuration of general options for preference pages
  */
 function boincwork_admin_prefs_options_form(&$form_state) {
-  $form = array(); 
-  $form['beta'] = array(
+    $form = array(); 
+    $form['beta'] = array(
     '#type' => 'checkbox',
     '#title' => t('Allow users to opt in to test beta applications'),
     '#default_value' => variable_get('boinc_prefs_options_beta', 0),
     '#required' => TRUE
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit')
-  );
-  // Add the official mechanical things and return
-  //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
-  return $form;
+    );
+    // Add the official mechanical things and return
+    //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
+    return $form;
 } 
 
 /**
-  * Handle validation of preference general settings form.
-  */
+ * Handle validation of preference general settings form.
+ */
 function boincwork_admin_prefs_options_form_validate($form, &$form_state) {
 }
 
 /**
-  * Handle submission of preference general settings form.
-  */
+ * Handle submission of preference general settings form.
+ */
 function boincwork_admin_prefs_options_form_submit($form, &$form_state) {
-  variable_set('boinc_prefs_options_beta', $form_state['values']['beta']);
-  drupal_set_message('Preference options have been updated.');
+    variable_set('boinc_prefs_options_beta', $form_state['values']['beta']);
+    drupal_set_message('Preference options have been updated.');
 }
 
 /**
  * 
  */
 function boincwork_admin_prefs_upload_form(&$form_state) {
-  $form = array(); 
-  $form['prefs_xml'] = array(
+    $form = array(); 
+    $form['prefs_xml'] = array(
     '#type' => 'textarea',
     '#title' => t('Project specific preferences XML'),
     '#default_value' => variable_get('boinc_project_specific_prefs_config', "<project_specific_preferences>\n\n</project_specific_preferences>"),
     '#required' => TRUE
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit')
-  );
-  // Add the official mechanical things and return
-  //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
-  return $form;
+    );
+    // Add the official mechanical things and return
+    //drupal_prepare_form('boincwork_admin_prefs_upload_form', $form, $form_state);
+    return $form;
 } 
 
 /**
-  * Handle validation of preference upload form.
-  */
+ * Handle validation of preference upload form.
+ */
 function boincwork_admin_prefs_upload_form_validate($form, &$form_state) {
   
-  $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
-  libxml_use_internal_errors(true);
-  $xml = new DomDocument();
-  $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
-  if (!$xml->schemaValidate($xsd)) {
+    $xsd = './' . drupal_get_path('module', 'boincwork') . '/includes/projectprefs.xsd';
+    libxml_use_internal_errors(true);
+    $xml = new DomDocument();
+    $xml->loadXML($form_state['values']['prefs_xml'], LIBXML_NOBLANKS);
+    if (!$xml->schemaValidate($xsd)) {
     $errors = libxml_get_errors();
     $lines = explode("\r", $form_state['values']['prefs_xml']);
     drupal_set_message("{$errors[0]->message} at line {$errors[0]->line}" .
-      ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
+        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), 'error');
     form_set_error('upload', t('XML file failed validation'));
-  }
+    }
 }
 
 /**
-  * Handle submission of preference upload form.
-  */
+ * Handle submission of preference upload form.
+ */
 function boincwork_admin_prefs_upload_form_submit($form, &$form_state) {
-  variable_set('boinc_project_specific_prefs_config', $form_state['values']['prefs_xml']);
-  drupal_set_message('The XML has been validated and any changes to
+    variable_set('boinc_project_specific_prefs_config', $form_state['values']['prefs_xml']);
+    drupal_set_message('The XML has been validated and any changes to
       preferences are now in place.');
 }
 
@@ -91,14 +91,14 @@ 
  * 
  */
 function boincwork_admin_prefs_presets_page($preset = 'standard') {
-  // Configure preference presets
-  if (function_exists('jump_quickly')) {
+    // Configure preference presets
+    if (function_exists('jump_quickly')) {
     $path = 'admin/boinc/prefs/presets';
     $preset_options = array(
-      "{$path}/standard" => t('Standard'),
-      "{$path}/maximum" => t('Maximum'),
-      "{$path}/green" => t('Green'),
-      "{$path}/minimum" => t('Minimum')
+        "{$path}/standard" => t('Standard'),
+        "{$path}/maximum" => t('Maximum'),
+        "{$path}/green" => t('Green'),
+        "{$path}/minimum" => t('Minimum')
     );
     variable_set('jump_use_js_presets-Array', 1);
     drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
@@ -106,15 +106,15 @@ 
     $output .= '<label>Preset:</label>';
     $output .= jump_quickly($preset_options, 'presets');
     $output .= '</div></div>';
-  }
-  $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
+    }
+    $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
 
-  $output .= '<div>';
-  $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
-  $output .= '<p>';
-  $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
-  $output .= '</div>';
-  return $output;
+    $output .= '<div>';
+    $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+    $output .= '<p>';
+    $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+    $output .= '</div>';
+    return $output;
 }
 
 /**
@@ -122,141 +122,141 @@ 
  */
 function boincwork_admin_prefs_presets_form(&$form_state, $preset = 'standard') {
 
-  // Check database for preset prefs
-  if (!variable_get('boincwork_preset_prefs', null))
+    // Check database for preset prefs
+    if (!variable_get('boincwork_preset_prefs', null))
     drupal_set_message(bts('No presets found in database, loading a default set of preferences for each preset. These will be saved to the database once you click \'Save configuration\'.', array(), NULL, 'boinc:admin-boinc-preference-presets'), 'status');
 
-  // Load a copy of the general prefs form
-  $form = boincwork_generalprefs_form($form_state, NULL, $preset);
-  if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
+    // Load a copy of the general prefs form
+    $form = boincwork_generalprefs_form($form_state, NULL, $preset);
+    if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
     unset($form['#submit'][$key]);
-  }
-  $form['#submit'][] = 'boincwork_admin_prefs_presets_form_submit';
+    }
+    $form['#submit'][] = 'boincwork_admin_prefs_presets_form_submit';
   
-  // Just keep the necessary items
-  $form['processor'] = $form['prefs']['advanced']['processor'];
-  $form['storage'] = $form['prefs']['advanced']['storage'];
-  $form['network'] = $form['prefs']['advanced']['network'];
-  unset($form['prefs']);
+    // Just keep the necessary items
+    $form['processor'] = $form['prefs']['advanced']['processor'];
+    $form['storage'] = $form['prefs']['advanced']['storage'];
+    $form['network'] = $form['prefs']['advanced']['network'];
+    unset($form['prefs']);
   
-  // Tweak some things so it behaves a little better
-  $form['#tree'] = TRUE;
-  $form['processor']['#collapsible'] = TRUE;
-  $form['storage']['#collapsible'] = TRUE;
-  $form['network']['#collapsible'] = TRUE;
+    // Tweak some things so it behaves a little better
+    $form['#tree'] = TRUE;
+    $form['processor']['#collapsible'] = TRUE;
+    $form['storage']['#collapsible'] = TRUE;
+    $form['network']['#collapsible'] = TRUE;
   
-  // Add a submit button and a hidden field to pass the preset
-  $form['submit'] = array(
+    // Add a submit button and a hidden field to pass the preset
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save configuration')
-  );
-  $form['saveuseconfigxml'] = array (
-      '#type' => 'submit',
-      '#value' => t('Save configuration with disk usage settings from config.xml'),
-      '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
-  );
-  $form['preset'] = array(
+    );
+    $form['saveuseconfigxml'] = array (
+        '#type' => 'submit',
+        '#value' => t('Save configuration with disk usage settings from config.xml'),
+        '#validate' => array('boincwork_admin_prefs_preset_saveuseconfigxml'),
+    );
+    $form['preset'] = array(
     '#type' => 'hidden',
     '#value' => $preset
-  );
+    );
   
-  // Add the official mechanical things and return
-  drupal_prepare_form('boincwork_admin_prefs_presets_form', $form, $form_state);
-  return $form;
+    // Add the official mechanical things and return
+    drupal_prepare_form('boincwork_admin_prefs_presets_form', $form, $form_state);
+    return $form;
 }
 
 /**
-  * Validate the preference presets form.
-  */
+ * Validate the preference presets form.
+ */
 function boincwork_admin_prefs_presets_form_validate($form, &$form_state) {
-  require_boinc('util');
-  $values = $form_state['values'];
+    require_boinc('util');
+    $values = $form_state['values'];
   
-  // Verify all non-boolean user input values and notify form API of failures
+    // Verify all non-boolean user input values and notify form API of failures
   
-  // Processing preferences
-  if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
+    // Processing preferences
+    if (!verify_numeric($values['processor']['idle_time_to_run'], 1, 9999)) form_set_error('idle_time_to_run', t('Invalid setting for') . " \"{$form['processor']['idle_time_to_run']['#title']} [x] {$form['processor']['idle_time_to_run']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['suspend_if_no_recent_input'], 0, 9999)) form_set_error('suspend_if_no_recent_input', t('Invalid setting for') . " \"{$form['processor']['suspend_if_no_recent_input']['#title']} [x] {$form['processor']['suspend_if_no_recent_input']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['suspend_cpu_usage'], 0, 100)) form_set_error('suspend_cpu_usage', t('Invalid setting for') . " \"{$form['processor']['suspend_cpu_usage']['#title']} [x] {$form['processor']['suspend_cpu_usage']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['start_hour'], 0, 23)) form_set_error('start_hour', t('Invalid setting for') . " \"{$form['processor']['start_hour']['#title']} [x] {$form['processor']['start_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['end_hour'], 0, 23)) form_set_error('end_hour', t('Invalid setting for') . " \"{$form['processor']['end_hour']['#title']} [x] {$form['processor']['end_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['cpu_scheduling_period_minutes'], 1, 9999)) form_set_error('cpu_scheduling_period_minutes', t('Invalid setting for') . " \"{$form['processor']['cpu_scheduling_period_minutes']['#title']} [x] {$form['processor']['cpu_scheduling_period_minutes']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['max_ncpus_pct'], 0, 100)) form_set_error('max_ncpus_pct', t('Invalid setting for') . " \"{$form['processor']['max_ncpus_pct']['#title']} [x] {$form['processor']['max_ncpus_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['processor']['cpu_usage_limit'], 0, 100)) form_set_error('cpu_usage_limit', t('Invalid setting for') . " \"{$form['processor']['cpu_usage_limit']['#title']} [x] {$form['processor']['cpu_usage_limit']['#field_suffix']}\"");
 
-  // Storage preferences
-  if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
-  if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
+    // Storage preferences
+    if (!verify_numeric($values['storage']['disk_max_used_gb'], 0, 9999999)) form_set_error('disk_max_used_gb', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_gb']['#title']} [x] {$form['storage']['disk_max_used_gb']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_min_free_gb'], 0.001, 9999999)) form_set_error('disk_min_free_gb', t('Invalid setting for') . " \"{$form['storage']['disk_min_free_gb']['#title']} [x] {$form['storage']['disk_min_free_gb']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_max_used_pct'], 0, 100)) form_set_error('disk_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['disk_max_used_pct']['#title']} [x] {$form['storage']['disk_max_used_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['disk_interval'], 0, 9999999)) form_set_error('disk_interval', t('Invalid setting for') . " \"{$form['storage']['disk_interval']['#title']} [x] {$form['storage']['disk_interval']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['vm_max_used_pct'], 0, 100)) form_set_error('vm_max_used_pct', t('Invalid setting for') . " \"{$form['storage']['vm_max_used_pct']['#title']} [x] {$form['storage']['vm_max_used_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['ram_max_used_busy_pct'], 0, 100)) form_set_error('ram_max_used_busy_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_busy_pct']['#title']} [x] {$form['storage']['ram_max_used_busy_pct']['#field_suffix']}\"");
+    if (!verify_numeric($values['storage']['ram_max_used_idle_pct'], 0, 100)) form_set_error('ram_max_used_idle_pct', t('Invalid setting for') . " \"{$form['storage']['ram_max_used_idle_pct']['#title']} [x] {$form['storage']['ram_max_used_idle_pct']['#field_suffix']}\"");
 
-  // Network preferences
-  if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
-  if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+    // Network preferences
+    if (!verify_numeric($values['network']['work_buf_min_days'], 0, 10)) form_set_error('work_buf_min_days', t('Invalid setting for') . " \"{$form['network']['work_buf_min_days']['#title']} [x] {$form['network']['work_buf_min_days']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['work_buf_additional_days'], 0, 10)) form_set_error('work_buf_additional_days', t('Invalid setting for') . " \"{$form['network']['work_buf_additional_days']['#title']} [x] {$form['network']['work_buf_additional_days']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['max_bytes_sec_down'], 0, 9999.999)) form_set_error('max_bytes_sec_down', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_down']['#title']} [x] {$form['network']['max_bytes_sec_down']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['max_bytes_sec_up'], 0, 9999.999)) form_set_error('max_bytes_sec_up', t('Invalid setting for') . " \"{$form['network']['max_bytes_sec_up']['#title']} [x] {$form['network']['max_bytes_sec_up']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['net_start_hour'], 0, 23)) form_set_error('net_start_hour', t('Invalid setting for') . " \"{$form['network']['net_start_hour']['#title']} [x] {$form['network']['net_start_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['net_end_hour'], 0, 23)) form_set_error('net_end_hour', t('Invalid setting for') . " \"{$form['network']['net_end_hour']['#title']} [x] {$form['network']['net_end_hour']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['daily_xfer_limit_mb'], 0, 9999999)) form_set_error('daily_xfer_limit_mb', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
+    if (!verify_numeric($values['network']['daily_xfer_period_days'], 0, 9999999)) form_set_error('daily_xfer_period_days', t('Invalid setting for') . " \"{$form['network']['daily_xfer_limit_mb']['#title']} [x] {$form['network']['daily_xfer_limit_mb']['#field_suffix']}\"");
 }
 
 /**
-  * Handle post-validation submission of preference presets form.
-  */
+ * Handle post-validation submission of preference presets form.
+ */
 function boincwork_admin_prefs_presets_form_submit($form, &$form_state) {
-  $values = $form_state['values'];
-  $preset = $form_state['values']['preset'];
+    $values = $form_state['values'];
+    $preset = $form_state['values']['preset'];
   
-  // Load baseline settings from configuration
-  $prefs = boincwork_get_preset_prefs($preset);
+    // Load baseline settings from configuration
+    $prefs = boincwork_get_preset_prefs($preset);
   
-  // Processing preferences
-  $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
-  $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
-  $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
-  $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
-  $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
-  $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
-  $prefs['start_hour'] = $values['processor']['start_hour'];
-  $prefs['end_hour'] = $values['processor']['end_hour'];
-  $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
-  $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
-  $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
-  $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
+    // Processing preferences
+    $prefs['run_on_batteries'] = ($values['processor']['run_on_batteries']) ? 0 : 1;
+    $prefs['run_if_user_active'] = ($values['processor']['run_if_user_active']) ? 0 : 1;
+    $prefs['run_gpu_if_user_active'] = ($values['processor']['run_gpu_if_user_active']) ? 0: 1;
+    $prefs['idle_time_to_run'] = $values['processor']['idle_time_to_run'];
+    $prefs['suspend_if_no_recent_input'] = $values['processor']['suspend_if_no_recent_input'];
+    $prefs['suspend_cpu_usage'] = $values['processor']['suspend_cpu_usage'];
+    $prefs['start_hour'] = $values['processor']['start_hour'];
+    $prefs['end_hour'] = $values['processor']['end_hour'];
+    $prefs['leave_apps_in_memory'] = ($values['processor']['leave_apps_in_memory']) ? 1 : 0;
+    $prefs['cpu_scheduling_period_minutes'] = $values['processor']['cpu_scheduling_period_minutes'];
+    $prefs['max_ncpus_pct'] = $values['processor']['max_ncpus_pct'];
+    $prefs['cpu_usage_limit'] = $values['processor']['cpu_usage_limit'];
   
-  // Storage preferences
-  $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
-  $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
-  $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
-  $prefs['disk_interval'] = $values['storage']['disk_interval'];
-  $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
-  $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
-  $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
+    // Storage preferences
+    $prefs['disk_max_used_gb'] = $values['storage']['disk_max_used_gb'];
+    $prefs['disk_min_free_gb'] = $values['storage']['disk_min_free_gb'];
+    $prefs['disk_max_used_pct'] = $values['storage']['disk_max_used_pct'];
+    $prefs['disk_interval'] = $values['storage']['disk_interval'];
+    $prefs['vm_max_used_pct'] = $values['storage']['vm_max_used_pct'];
+    $prefs['ram_max_used_busy_pct'] = $values['storage']['ram_max_used_busy_pct'];
+    $prefs['ram_max_used_idle_pct'] = $values['storage']['ram_max_used_idle_pct'];
   
-  // Network preferences
-  $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
-  $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
-  $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
-  $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
-  $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
-  $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
-  $prefs['net_start_hour'] = $values['network']['net_start_hour'];
-  $prefs['net_end_hour'] = $values['network']['net_end_hour'];
-  $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
-  $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
-  $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
+    // Network preferences
+    $prefs['work_buf_min_days'] = $values['network']['work_buf_min_days'];
+    $prefs['work_buf_additional_days'] = $values['network']['work_buf_additional_days'];
+    $prefs['confirm_before_connecting'] = ($values['network']['confirm_before_connecting']) ? 1 : 0;
+    $prefs['hangup_if_dialed'] = ($values['network']['hangup_if_dialed']) ? 1 : 0;
+    $prefs['max_bytes_sec_down'] = $values['network']['max_bytes_sec_down']*1000;
+    $prefs['max_bytes_sec_up'] = $values['network']['max_bytes_sec_up']*1000;
+    $prefs['net_start_hour'] = $values['network']['net_start_hour'];
+    $prefs['net_end_hour'] = $values['network']['net_end_hour'];
+    $prefs['daily_xfer_limit_mb'] = $values['network']['daily_xfer_limit_mb'];
+    $prefs['daily_xfer_period_days'] = $values['network']['daily_xfer_period_days'];
+    $prefs['dont_verify_images'] = ($values['network']['dont_verify_images']) ? 1 : 0;
   
-  //Remove @attributes to match new format (see boincwork.forms.inc
-  //function boincwork_generalprefs_form)
-  unset($prefs['@attributes']['preset']);
+    //Remove @attributes to match new format (see boincwork.forms.inc
+    //function boincwork_generalprefs_form)
+    unset($prefs['@attributes']['preset']);
   
-  // Update the configuration
-  boincwork_save_preset_prefs($prefs, $preset);
-  drupal_set_message(t('The "@name" preset has been updated.',
+    // Update the configuration
+    boincwork_save_preset_prefs($prefs, $preset);
+    drupal_set_message(t('The "@name" preset has been updated.',
     array('@name' => $preset)));
 }
 
@@ -265,26 +265,26 @@ 
  */
 function boincwork_save_preset_prefs($updated_prefs, $preset = 'standard') {
   
-  // Get the full configuration
-  $all_presets = boincwork_get_preset_prefs();
-  $all_presets = (array) $all_presets['general_preferences'];
+    // Get the full configuration
+    $all_presets = boincwork_get_preset_prefs();
+    $all_presets = (array) $all_presets['general_preferences'];
   
-  // Check for sane config
-  if (isset($all_presets['preset'])) {
+    // Check for sane config
+    if (isset($all_presets['preset'])) {
     if (!is_numeric(key($all_presets['preset']))) {
-      $all_presets['preset'] = array($all_presets['preset']);
+        $all_presets['preset'] = array($all_presets['preset']);
     }
     foreach ($all_presets['preset'] as $key => $old_preset) {
-      // Find the preset being updated and... update it
-      if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
+        // Find the preset being updated and... update it
+        if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
         $all_presets['preset'][$key] = $updated_prefs + $old_preset;
-      }
+        }
+    }
     }
-  }
   
-  // Convert prefs back to XML and save to database
-  $all_presets = array('general_preferences' => $all_presets);
-  variable_set('boincwork_preset_prefs', save_configuration($all_presets));
+    // Convert prefs back to XML and save to database
+    $all_presets = array('general_preferences' => $all_presets);
+    variable_set('boincwork_preset_prefs', save_configuration($all_presets));
 }
 
 /**

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -15,7 +15,7 @@ 
     '#type' => 'checkbox',
     '#title' => t('Allow users to opt in to test beta applications'),
     '#default_value' => variable_get('boinc_prefs_options_beta', 0),
-    '#required' => TRUE
+    '#required' => true
   );
   $form['submit'] = array(
     '#type' => 'submit',
@@ -49,7 +49,7 @@ 
     '#type' => 'textarea',
     '#title' => t('Project specific preferences XML'),
     '#default_value' => variable_get('boinc_project_specific_prefs_config', "<project_specific_preferences>\n\n</project_specific_preferences>"),
-    '#required' => TRUE
+    '#required' => true
   );
   $form['submit'] = array(
     '#type' => 'submit',
@@ -110,9 +110,9 @@ 
   $output .= drupal_get_form('boincwork_admin_prefs_presets_form', $preset);
 
   $output .= '<div>';
-  $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+  $output .= bts('Usage: \'Save configuration\' will save the above preferences into the drupal database. These will be the preset computing (global) preferences that will fill in the preferences form once a user loads the Account Preferences page.', array(), null, 'boinc:admin-boinc-preference-presets');
   $output .= '<p>';
-  $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), NULL, 'boinc:admin-boinc-preference-presets');
+  $output .= bts('\'Save configuration with disk usage settings from config.xml\' will save the above preferences into the drupal database, but also load disk usage settings from the BOINC project\'s config.xml file. These will overwrite any disk usage settings you have placed above. Caution: A user\'s personal preferences will not change if you load the disk usage settings from config.xml here into the drupal database. They must change their preference settings manually.', array(), null, 'boinc:admin-boinc-preference-presets');
   $output .= '</div>';
   return $output;
 }
@@ -124,10 +124,10 @@ 
 
   // Check database for preset prefs
   if (!variable_get('boincwork_preset_prefs', null))
-    drupal_set_message(bts('No presets found in database, loading a default set of preferences for each preset. These will be saved to the database once you click \'Save configuration\'.', array(), NULL, 'boinc:admin-boinc-preference-presets'), 'status');
+    drupal_set_message(bts('No presets found in database, loading a default set of preferences for each preset. These will be saved to the database once you click \'Save configuration\'.', array(), null, 'boinc:admin-boinc-preference-presets'), 'status');
 
   // Load a copy of the general prefs form
-  $form = boincwork_generalprefs_form($form_state, NULL, $preset);
+  $form = boincwork_generalprefs_form($form_state, null, $preset);
   if ($key = array_search('boincwork_generalprefs_form_submit', $form['#submit'])) {
     unset($form['#submit'][$key]);
   }
@@ -140,10 +140,10 @@ 
   unset($form['prefs']);
   
   // Tweak some things so it behaves a little better
-  $form['#tree'] = TRUE;
-  $form['processor']['#collapsible'] = TRUE;
-  $form['storage']['#collapsible'] = TRUE;
-  $form['network']['#collapsible'] = TRUE;
+  $form['#tree'] = true;
+  $form['processor']['#collapsible'] = true;
+  $form['storage']['#collapsible'] = true;
+  $form['network']['#collapsible'] = true;
   
   // Add a submit button and a hidden field to pass the preset
   $form['submit'] = array(
@@ -276,7 +276,7 @@ 
     }
     foreach ($all_presets['preset'] as $key => $old_preset) {
       // Find the preset being updated and... update it
-      if (isset($old_preset['@attributes']['name']) AND $old_preset['@attributes']['name'] == $preset) {
+      if (isset($old_preset['@attributes']['name']) and $old_preset['@attributes']['name'] == $preset) {
         $all_presets['preset'][$key] = $updated_prefs + $old_preset;
       }
     }

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';
-  }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
   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';
+    return round($gflops, 2).' GFLOPS';
   }
 }