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/boincstats/boincstats.admin.inc

Indentation +28 added lines, -28 removed lines

@@ -8,38 +8,38 @@ 
 
 
 /**
-  * The BOINC stats configuration determines where statistics are sourced
-  */
+ * The BOINC stats configuration determines where statistics are sourced
+ */
 function boincstats_admin_stats_system(&$form_state) {
-  $form = array();
-  $default = array(
+    $form = array();
+    $default = array(
     'boinc_stats_server' => variable_get('boinc_stats_server', 'stats.gridrepublic.org'),
     'boinc_stats_project_list_rpc' => variable_get('boinc_stats_project_list_rpc', 'rpc/get_projects.php'),
     'boinc_stats_project_credit_history_rpc' => variable_get('boinc_stats_project_credit_history_rpc', 'rpc/get_project_tc_history.php'),
     'boinc_stats_user_credit_history_rpc' => variable_get('boinc_stats_user_credit_history_rpc', 'rpc/get_user_credit_history_by_project.php'),
     'boinc_stats_remote_project_id' => variable_get('boinc_stats_remote_project_id', ''),
-  );
-  // Define the form
-  $form['boinc_stats_server'] = array(
+    );
+    // Define the form
+    $form['boinc_stats_server'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_server']
-  );
-  $form['boinc_stats_project_list_rpc'] = array(
+    );
+    $form['boinc_stats_project_list_rpc'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_project_list_rpc']
-  );
-  $form['boinc_stats_project_credit_history_rpc'] = array(
+    );
+    $form['boinc_stats_project_credit_history_rpc'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_project_credit_history_rpc']
-  );
-  $form['boinc_stats_user_credit_history_rpc'] = array(
+    );
+    $form['boinc_stats_user_credit_history_rpc'] = array(
     '#type' => 'value',
     '#value' => $default['boinc_stats_user_credit_history_rpc']
-  );
-  $form['boinc_stats_remote_project_id'] = array(
+    );
+    $form['boinc_stats_remote_project_id'] = array(
     '#type' => 'textfield',
     '#title' => t('Stats ID for @project', array(
-      '@project' => variable_get('site_name', t('this project')))),
+        '@project' => variable_get('site_name', t('this project')))),
     '#default_value' => $default['boinc_stats_remote_project_id'], 
     '#description' => t('This project must be registered with a stats system in
       order for some statistics to be available. Currently only one system is
@@ -47,26 +47,26 @@ 
         '!find_project_id' => l(t('Find your project ID'),
         "http://{$default['boinc_stats_server']}/{$default['boinc_stats_project_list_rpc']}",
         array('attributes' => array('target' => 'external')))
-      )
+        )
     )
-  );
-  return system_settings_form($form);
+    );
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC stats form.
-  */
+ * Validate the BOINC stats form.
+ */
 function boincstats_admin_stats_system_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!$values['boinc_stats_remote_project_id']) {
+    $values = $form_state['values'];
+    if (!$values['boinc_stats_remote_project_id']) {
     form_set_error('boinc_stats_remote_project_id',
-      t('Stats may not work without a valid stats ID configured!'));
-  }
+        t('Stats may not work without a valid stats ID configured!'));
+    }
 }
 
 /**
-  * Handle post-validation submission of BOINC stats form.
-  */
+ * Handle post-validation submission of BOINC stats form.
+ */
 function boincstats_admin_stats_system_submit($form, &$form_state) {
-  drupal_set_message(t('Stats system configuration has been updated.'));
+    drupal_set_message(t('Stats system configuration has been updated.'));
 }

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

Indentation +234 added lines, -234 removed lines

@@ -14,9 +14,9 @@ 
  * The definition of the create team form
  */
 function boincteam_create_form(&$form_state) {
-  $form = array();
+    $form = array();
   
-  $default = array(
+    $default = array(
     'name' => '',
     'name_html' => '',
     'website' => '',
@@ -24,105 +24,105 @@ 
     'country' => 0,
     'joinable' => TRUE,
     'description' => '',
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes'), 0 => bts('no')),
-  );
+    );
   
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
   
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags'),
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags'),
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page"),
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['joinable'],
     '#size' => 34,
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description of team'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
     '#description' => NULL,
-  );
-  $form['format'] = filter_form();
+    );
+    $form['format'] = filter_form();
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save team'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel'), $_GET['q']) . '</li>'
-  );
+    );
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -130,41 +130,41 @@ 
  */
 function boincteam_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
   
-  if (!$name) {
+    if (!$name) {
     form_set_error('name', bts('Team name is required.'));
-  }
-  else {
+    }
+    else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
-      form_set_error('name', bts('A team named "@name" already exists.',
+        form_set_error('name', bts('A team named "@name" already exists.',
         array('@name' => $name)));
     }
-  }
+    }
   
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
+    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
     form_set_error('type', bts('Please select a team type.'));
-  }
+    }
 }
 
 /**
  * The create team submit handler
  */
 function boincteam_create_form_submit($form, &$form_state) {
-  global $user;
-  $account = user_load($user->uid);
-  $values = $form_state['values'];
-  //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
+    global $user;
+    $account = user_load($user->uid);
+    $values = $form_state['values'];
+    //drupal_set_message('<pre>' . print_r($values,true) . '</pre>');
   
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
   
-  // Create the team in the BOINC db
+    // Create the team in the BOINC db
   
-  require_boinc(array('user','team'));
-  $boinc_team = make_team(
+    require_boinc(array('user','team'));
+    $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
     $values['website'],
@@ -172,27 +172,27 @@ 
     $values['name_html'],
     $values['description'],
     $values['country']
-  );
+    );
 
-  if ($boinc_team) {
+    if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
     return FALSE;
-  }
+    }
   
-  // Create the team node in Drupal
+    // Create the team node in Drupal
   
-  $teaser = node_teaser($values['description']);
-  $created_time = time();
-  $input_format = variable_get('filter_default_format', 1);
+    $teaser = node_teaser($values['description']);
+    $created_time = time();
+    $input_format = variable_get('filter_default_format', 1);
   
-  $node = array(
+    $node = array(
     'type' => 'team',
     'title' => $values['name'],
     'body' => $values['description'],
@@ -206,21 +206,21 @@ 
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
-  );
+    );
   
-  // Use pathauto function, if available, to clean up the path
-  if (module_exists('pathauto')) {
+    // Use pathauto function, if available, to clean up the path
+    if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
       cannot be created.', 'error');
-  }
+    }
   
-  /*
+    /*
   // Add special organic group properties
   $node['og_description'] = strip_tags($boincteam->description);
   $node['og_selective'] = OG_OPEN;
@@ -229,26 +229,26 @@ 
   $node['og_private'] = 0;
   */
   
-  $node = (object) $node; // node_save requires an object form
+    $node = (object) $node; // node_save requires an object form
   
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
   
-  $node->taxonomy[] = taxonomy_get_term($values['type']);
+    $node->taxonomy[] = taxonomy_get_term($values['type']);
   
-  // Save the team node
-  node_save($node);
+    // Save the team node
+    node_save($node);
   
-  // Save the team IDs to a BOINC <--> Drupal reference table.
-  db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
+    // Save the team IDs to a BOINC <--> Drupal reference table.
+    db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boinc_team->id, $node->nid);
   
-  drupal_set_message(t('Team "@name" has been created.', 
+    drupal_set_message(t('Team "@name" has been created.', 
     array('@name' => $values['name'])));
   
-  $form_state['redirect'] = "community/teams/{$node->nid}";
+    $form_state['redirect'] = "community/teams/{$node->nid}";
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -259,17 +259,17 @@ 
  * The definition of the edit team form
  */
 function boincteam_edit_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
   
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+    $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
   
-  $form_state['storage']['team_id'] = $team_id;
-  $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
+    $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
   
-  $default = array(
+    $default = array(
     'name' => $boincteam->name,
     'name_html' => $boincteam->name_html,
     'website' => $boincteam->url,
@@ -277,79 +277,79 @@ 
     'country' => $boincteam->country,
     'joinable' => $boincteam->joinable,
     'description' => $boincteam->description,
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes'), 0 => bts('no')),
-  );
+    );
   
-  // Vocabulary based option sets
-  $form['type_options'] = array(
+    // Vocabulary based option sets
+    $form['type_options'] = array(
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type'))
-  );
-  $vocabs = taxonomy_get_vocabularies(NULL);
-  foreach ($vocabs as $vocab) {
+    );
+    $vocabs = taxonomy_get_vocabularies(NULL);
+    foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
       $team_types = taxonomy_get_tree($vocab->vid);
-      if (module_exists('internationalization')) {
+        if (module_exists('internationalization')) {
         $team_types = i18ntaxonomy_localize_terms($team_types);
-      }
-      foreach ($team_types as $team_type) {
+        }
+        foreach ($team_types as $team_type) {
         $form['type_options']['#value'][$team_type->tid] = $team_type->name;
-      }
-      break;
+        }
+        break;
     default:
     }
-  }
-  $form['country_options'] = array(
+    }
+    $form['country_options'] = array(
     '#type' => 'value',
     '#value' => boinccore_get_country_list(),
-  );
+    );
   
-  // Form elements
-  $form['name'] = array(
+    // Form elements
+    $form['name'] = array(
     '#title' => bts('Team name'),
     '#type' => 'textfield',
     '#default_value' => $default['name'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['name_html'] = array(
+    );
+    $form['name_html'] = array(
     '#title' => bts('Team name -- HTML version (optional)'),
     '#type' => 'textfield',
     '#default_value' => $default['name_html'],
     '#size' => 34,
     '#description' => bts('You may use limited HTML tags'),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['website'] = array(
+    );
+    $form['website'] = array(
     '#title' => bts('Team website (optional)'),
     '#type' => 'textfield',
     '#default_value' => $default['website'],
     '#size' => 34,
     '#description' => bts("Displayed on the team's page"),
     '#disabled' => $is_boinc_wide,
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#title' => bts('Type of team'),
     '#type' => 'select',
     '#options' => $form['type_options']['#value'],
     '#default_value' => $default['type'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['country'] = array(
+    );
+    $form['country'] = array(
     '#title' => bts('Country'),
     '#type' => 'select',
     '#options' => $form['country_options']['#value'],
     '#default_value' => $default['country'],
     '#disabled' => $is_boinc_wide,
-  );
-  $form['joinable'] = array(
+    );
+    $form['joinable'] = array(
     '#title' => bts('Accept new members?'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
@@ -357,49 +357,49 @@ 
     '#default_value' => $default['joinable'],
     '#size' => 34,
     '#disabled' => $is_boinc_wide,
-  );
-  if (!$is_boinc_wide) {
+    );
+    if (!$is_boinc_wide) {
     $form['description'] = array(
-      '#title' => bts('Description of team'),
-      '#type' => 'textarea',
-      '#default_value' => $default['description'],
-      '#size' => 5,
-      '#description' => NULL,
+        '#title' => bts('Description of team'),
+        '#type' => 'textarea',
+        '#default_value' => $default['description'],
+        '#size' => 5,
+        '#description' => NULL,
     );
     $form['format'] = filter_form();
     
     // Form control
     $form['form control tabs prefix'] = array(
-      '#value' => '<ul class="form-control tab-list">'
+        '#value' => '<ul class="form-control tab-list">'
     );
     $form['submit'] = array(
-      '#prefix' => '<li class="first tab">',
-      '#type' => 'submit',
-      '#value' => bts('Save changes'),
-      '#suffix' => '</li>',
+        '#prefix' => '<li class="first tab">',
+        '#type' => 'submit',
+        '#value' => bts('Save changes'),
+        '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+        '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+    }
+    else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description') . ':</label></div><div class="form-item">',
-      '#value' => $default['description'],
-      '#suffix' => '</div>',
+        '#prefix' => '<div class="form-item"><label>' . bts('Description') . ':</label></div><div class="form-item">',
+        '#value' => $default['description'],
+        '#suffix' => '</div>',
     );
     drupal_set_message(
-      bts('This is a BOINC-wide team. Changes can be made at the !site.',
+        bts('This is a BOINC-wide team. Changes can be made at the !site.',
         array('!site' => l(bts('BOINC-wide teams site'),
-          'http://boinc.berkeley.edu/teams/'
+            'http://boinc.berkeley.edu/teams/'
         ))
-      ),
-      'warning');
-  }
+        ),
+        'warning');
+    }
   
-  $form['#redirect'] = "community/teams/{$team_id}";
+    $form['#redirect'] = "community/teams/{$team_id}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -407,32 +407,32 @@ 
  */
 function boincteam_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
-  $name = $values['name'];
+    $values = $form_state['values'];
+    $name = $values['name'];
   
-  if ($form_state['storage']['is_boinc_wide']) {
+    if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.'));
-  }
-  else {
+    }
+    else {
     if (!$name) {
-      form_set_error('name', bts('Team name is required.'));
+        form_set_error('name', bts('Team name is required.'));
     }
     else {
-      $team = node_load($form_state['storage']['team_id']);
-      if ($name != $team->title) {
+        $team = node_load($form_state['storage']['team_id']);
+        if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
         require_boinc('boinc_db');
         if (BoincTeam::lookup_name($name)) {
-          form_set_error('name', bts('A team named "@name" already exists.',
+            form_set_error('name', bts('A team named "@name" already exists.',
             array('@name' => $name)));
         }
-      }
+        }
     }
   
     if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
-      form_set_error('type', bts('Please select a team type.'));
+        form_set_error('type', bts('Please select a team type.'));
+    }
     }
-  }
 }
 
 /**
@@ -440,18 +440,18 @@ 
  */
 function boincteam_edit_form_submit($form, &$form_state) {
   
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
   
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
   
-  $input_format = !empty($values['format']) ? $values['format'] : 4;
-  $values['description'] = check_markup($values['description'], $input_format);
+    $input_format = !empty($values['format']) ? $values['format'] : 4;
+    $values['description'] = check_markup($values['description'], $input_format);
   
-  // Update the team in the BOINC db
-  db_set_active('boinc');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc');
+    db_query("
     UPDATE {team} SET
       name = '%s',
       name_lc = '%s',
@@ -471,32 +471,32 @@ 
     $values['country'],
     $values['joinable'],
     $boincteam_id
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Update the team node in Drupal
+    // Update the team node in Drupal
   
-  $team->title = $values['name'];
-  $team->body = $values['description'];
-  $team->teaser = node_teaser($values['description']);
+    $team->title = $values['name'];
+    $team->body = $values['description'];
+    $team->teaser = node_teaser($values['description']);
   
-  /*
+    /*
   $node->field_description[]['value'] = $boincteam->description;
   $node->field_url[]['value'] = $boincteam->url;
   $node->field_country[]['value'] = $boincteam->country;
   */
   
-  // Replace any existing taxonomy with the new one
-  $team->taxonomy = array(taxonomy_get_term($values['type']));
+    // Replace any existing taxonomy with the new one
+    $team->taxonomy = array(taxonomy_get_term($values['type']));
   
-  // Save the team node
-  node_save($team);
+    // Save the team node
+    node_save($team);
   
-  drupal_set_message(t('Details for "@team" have been updated.', 
+    drupal_set_message(t('Details for "@team" have been updated.', 
     array('@team' => $values['name'])));
     
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }
 
 
@@ -508,42 +508,42 @@ 
  * The definition of the add team admin form
  */
 function boincteam_add_admin_form(&$form_state, $team_id) {
-  $form = array();
+    $form = array();
   
-  $team = node_load($team_id);
-  $boincteam = boincteam_load(boincteam_lookup_id($team_id));
+    $team = node_load($team_id);
+    $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $form_state['storage']['team_id'] = $team_id;
+    $form_state['storage']['team_id'] = $team_id;
   
-  $default = array(
+    $default = array(
     'email' => '',
-  );
+    );
   
-  // Form elements
-  $form['email'] = array(
+    // Form elements
+    $form['email'] = array(
     '#title' => bts('Enter email address'),
     '#type' => 'textfield',
     '#default_value' => $default['email'],
     '#size' => 34,
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Add'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
-  );
+    );
   
-  //$form['#redirect'] = "community/teams/{$team_id}";
+    //$form['#redirect'] = "community/teams/{$team_id}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -551,40 +551,40 @@ 
  */
 function boincteam_add_admin_form_validate($form, &$form_state) {
 
-  $team_id = $form_state['storage']['team_id'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $values = $form_state['values'];
   
-  $team = node_load($team_id);
+    $team = node_load($team_id);
   
-  if (!$values['email']) {
+    if (!$values['email']) {
     form_set_error('email', bts('Email address is required.'));
-  }
-  else {
+    }
+    else {
     $account = user_load(array('mail' => $values['email']));
     if ((!$account) OR ($account->team != $team_id)) {
-      form_set_error('email', bts('There is no user on your team with that email address.'));
+        form_set_error('email', bts('There is no user on your team with that email address.'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {
-      form_set_error('email', bts('@user is the founder of @team!',
+        form_set_error('email', bts('@user is the founder of @team!',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         )
-      ));
+        ));
     }
     elseif (boincteam_is_admin($team_id, $account->uid)) {
-      form_set_error('email', bts('@user is already an admin of @team.',
+        form_set_error('email', bts('@user is already an admin of @team.',
         array(
-          '@user' => $account->boincuser_name,
-          '@team' => $team->title,
+            '@user' => $account->boincuser_name,
+            '@team' => $team->title,
         )
-      ));
+        ));
     }
     else {
-      $form_state['storage']['boincuser_id'] = $account->boincuser_id;
-      $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+        $form_state['storage']['boincuser_id'] = $account->boincuser_id;
+        $form_state['storage']['boincuser_name'] = $account->boincuser_name;
+    }
     }
-  }
 }
 
 /**
@@ -592,17 +592,17 @@ 
  */
 function boincteam_add_admin_form_submit($form, &$form_state) {
   
-  $team_id = $form_state['storage']['team_id'];
-  $boincuser_id = $form_state['storage']['boincuser_id'];
-  $user_name = $form_state['storage']['boincuser_name'];
-  $values = $form_state['values'];
+    $team_id = $form_state['storage']['team_id'];
+    $boincuser_id = $form_state['storage']['boincuser_id'];
+    $user_name = $form_state['storage']['boincuser_name'];
+    $values = $form_state['values'];
   
-  $team = node_load($team_id);
-  $boincteam_id = boincteam_lookup_id($team_id);
+    $team = node_load($team_id);
+    $boincteam_id = boincteam_lookup_id($team_id);
   
-  // Update the team in the BOINC db
-  db_set_active('boinc');
-  db_query("
+    // Update the team in the BOINC db
+    db_set_active('boinc');
+    db_query("
     INSERT INTO {team_admin} SET
       teamid = '%d',
       userid = '%d',
@@ -610,15 +610,15 @@ 
     $boincteam_id,
     $boincuser_id,
     time()
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  // Could assign a role in Drupal here, as needed
+    // Could assign a role in Drupal here, as needed
   
   
-  drupal_set_message(t('@user has been added as an admin.', 
+    drupal_set_message(t('@user has been added as an admin.', 
     array('@user' => $user_name)));
     
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }

Spacing +8 added lines, -8 removed lines

@@ -119,7 +119,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), $_GET['q']) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel'), $_GET['q']).'</li>'
   );
   
   return $form;
@@ -163,7 +163,7 @@ 
   
   // Create the team in the BOINC db
   
-  require_boinc(array('user','team'));
+  require_boinc(array('user', 'team'));
   $boinc_team = make_team(
     $account->boincuser_id,
     $values['name'],
@@ -199,10 +199,10 @@ 
     'teaser' => $teaser,
     'uid' => $user->uid,
     'path' => null,
-    'status' => 1,  // published or not - always publish
+    'status' => 1, // published or not - always publish
     'promote' => 0,
     'created' => $created_time,
-    'comment' => 0,  // comments disabled
+    'comment' => 0, // comments disabled
     'moderate' => 0,
     'sticky' => 0,
     'format' => $input_format
@@ -229,7 +229,7 @@ 
   $node['og_private'] = 0;
   */
   
-  $node = (object) $node; // node_save requires an object form
+  $node = (object)$node; // node_save requires an object form
   
   /*
   $node->field_description[]['value'] = $boincteam->description;
@@ -379,12 +379,12 @@ 
       '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+      '#value' => '<li class="tab">'.l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)).'</li>'
     );
   }
   else {
     $form['description'] = array(
-      '#prefix' => '<div class="form-item"><label>' . bts('Description') . ':</label></div><div class="form-item">',
+      '#prefix' => '<div class="form-item"><label>'.bts('Description').':</label></div><div class="form-item">',
       '#value' => $default['description'],
       '#suffix' => '</div>',
     );
@@ -538,7 +538,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)).'</li>'
   );
   
   //$form['#redirect'] = "community/teams/{$team_id}";

Braces +10 added lines, -20 removed lines

@@ -135,8 +135,7 @@ 
   
   if (!$name) {
     form_set_error('name', bts('Team name is required.'));
-  }
-  else {
+  } else {
     require_boinc('boinc_db');
     if (BoincTeam::lookup_name($name)) {
       form_set_error('name', bts('A team named "@name" already exists.',
@@ -177,8 +176,7 @@ 
   if ($boinc_team) {
     $boinc_user = BoincUser::lookup_id($account->boincuser_id);
     user_join_team($boinc_team, $boinc_user);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
@@ -212,8 +210,7 @@ 
   if (module_exists('pathauto')) {
     module_load_include('inc', 'pathauto', 'pathauto');
     $node['path'] = pathauto_cleanstring($values['name']);
-  }
-  else {
+  } else {
     drupal_set_message(t('Teams cannot be created at this time. Please 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams require the Pathauto module. Teams
@@ -381,8 +378,7 @@ 
     $form['form control tabs'] = array(
       '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
     );
-  }
-  else {
+  } else {
     $form['description'] = array(
       '#prefix' => '<div class="form-item"><label>' . bts('Description') . ':</label></div><div class="form-item">',
       '#value' => $default['description'],
@@ -412,12 +408,10 @@ 
   
   if ($form_state['storage']['is_boinc_wide']) {
     form_set_error('none', bts('This team is managed by the BOINC-wide teams system and cannot be updated here.'));
-  }
-  else {
+  } else {
     if (!$name) {
       form_set_error('name', bts('Team name is required.'));
-    }
-    else {
+    } else {
       $team = node_load($form_state['storage']['team_id']);
       if ($name != $team->title) {
         // If changing the name ("title" in Drupal terms), check that the new name is available
@@ -558,29 +552,25 @@ 
   
   if (!$values['email']) {
     form_set_error('email', bts('Email address is required.'));
-  }
-  else {
+  } else {
     $account = user_load(array('mail' => $values['email']));
     if ((!$account) OR ($account->team != $team_id)) {
       form_set_error('email', bts('There is no user on your team with that email address.'));
-    }
-    elseif (boincteam_is_founder($team_id, $account->uid)) {
+    } elseif (boincteam_is_founder($team_id, $account->uid)) {
       form_set_error('email', bts('@user is the founder of @team!',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         )
       ));
-    }
-    elseif (boincteam_is_admin($team_id, $account->uid)) {
+    } elseif (boincteam_is_admin($team_id, $account->uid)) {
       form_set_error('email', bts('@user is already an admin of @team.',
         array(
           '@user' => $account->boincuser_name,
           '@team' => $team->title,
         )
       ));
-    }
-    else {
+    } else {
       $form_state['storage']['boincuser_id'] = $account->boincuser_id;
       $form_state['storage']['boincuser_name'] = $account->boincuser_name;
     }

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

@@ -22,7 +22,7 @@ 
     'website' => '',
     'type' => 0,
     'country' => 0,
-    'joinable' => TRUE,
+    'joinable' => true,
     'description' => '',
   );
   
@@ -37,7 +37,7 @@ 
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type'))
   );
-  $vocabs = taxonomy_get_vocabularies(NULL);
+  $vocabs = taxonomy_get_vocabularies(null);
   foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
@@ -104,7 +104,7 @@ 
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
-    '#description' => NULL,
+    '#description' => null,
   );
   $form['format'] = filter_form();
   
@@ -144,7 +144,7 @@ 
     }
   }
   
-  if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
+  if (!$values['type'] or !isset($values['type_options'][$values['type']])) {
     form_set_error('type', bts('Please select a team type.'));
   }
 }
@@ -183,7 +183,7 @@ 
       contact the @project administrators!', array('@project' => PROJECT)));
     watchdog('BOINC team', 'BOINC teams cannot be created for an unknown
       reason.', 'error');
-    return FALSE;
+    return false;
   }
   
   // Create the team node in Drupal
@@ -264,7 +264,7 @@ 
   $team = node_load($team_id);
   $boincteam = boincteam_load(boincteam_lookup_id($team_id));
   
-  $is_boinc_wide = ($boincteam->seti_id > 0) ? TRUE : FALSE;
+  $is_boinc_wide = ($boincteam->seti_id > 0) ? true : false;
   
   $form_state['storage']['team_id'] = $team_id;
   $form_state['storage']['is_boinc_wide'] = $is_boinc_wide;
@@ -290,7 +290,7 @@ 
     '#type' => 'value',
     '#value' => array(0 => bts('Choose type'))
   );
-  $vocabs = taxonomy_get_vocabularies(NULL);
+  $vocabs = taxonomy_get_vocabularies(null);
   foreach ($vocabs as $vocab) {
     switch ($vocab->name) {
     case 'Teams':
@@ -364,7 +364,7 @@ 
       '#type' => 'textarea',
       '#default_value' => $default['description'],
       '#size' => 5,
-      '#description' => NULL,
+      '#description' => null,
     );
     $form['format'] = filter_form();
     
@@ -379,7 +379,7 @@ 
       '#suffix' => '</li>',
     );
     $form['form control tabs'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+      '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', true)) . '</li>'
     );
   }
   else {
@@ -429,7 +429,7 @@ 
       }
     }
   
-    if (!$values['type'] OR !isset($values['type_options'][$values['type']])) {
+    if (!$values['type'] or !isset($values['type_options'][$values['type']])) {
       form_set_error('type', bts('Please select a team type.'));
     }
   }
@@ -538,7 +538,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', TRUE)) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/edit', true)) . '</li>'
   );
   
   //$form['#redirect'] = "community/teams/{$team_id}";
@@ -561,7 +561,7 @@ 
   }
   else {
     $account = user_load(array('mail' => $values['email']));
-    if ((!$account) OR ($account->team != $team_id)) {
+    if ((!$account) or ($account->team != $team_id)) {
       form_set_error('email', bts('There is no user on your team with that email address.'));
     }
     elseif (boincteam_is_founder($team_id, $account->uid)) {

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/includes/boincteam.helpers.inc

Indentation +50 added lines, -50 removed lines

@@ -15,41 +15,41 @@ 
  */
 function boincteam_sync() {
   
-  // Get the list of teams to import
-  db_set_active('boinc');
-  $boinc_teams = db_query('
+    // Get the list of teams to import
+    db_set_active('boinc');
+    $boinc_teams = db_query('
     SELECT id, name, description, userid, create_time, seti_id
     FROM team
     WHERE mod_time > FROM_UNIXTIME(%d)',
     variable_get('boincteam_last_sync', 0)
-  );
-  db_set_active('default');
+    );
+    db_set_active('default');
   
-  $existing_teams = array();
+    $existing_teams = array();
   
-  // Get the list of teams already in Drupal to be sure we're not importing
-  // any twice
-  $result = db_query('
+    // Get the list of teams already in Drupal to be sure we're not importing
+    // any twice
+    $result = db_query('
     SELECT nid, team_id FROM {boincteam}'
-  );
-  while ($row = db_fetch_object($result)) {
+    );
+    while ($row = db_fetch_object($result)) {
     $existing_teams[$row->team_id] = $row->nid;
-  }
+    }
   
-  while ($boinc_team = db_fetch_object($boinc_teams)) {
+    while ($boinc_team = db_fetch_object($boinc_teams)) {
     $success = NULL;
     if (isset($existing_teams[$boinc_team->id])) {
-      if ($boinc_team->seti_id > 0) {
+        if ($boinc_team->seti_id > 0) {
         // Sync BOINC-wide teams
         $nid = $existing_teams[$boinc_team->id];
         $success = boincteam_import($boinc_team, $nid);
-      }
+        }
     }
     else {
-      // Import new teams created by RPC or ops/team_import.php
-      $success = boincteam_import($boinc_team);
+        // Import new teams created by RPC or ops/team_import.php
+        $success = boincteam_import($boinc_team);
+    }
     }
-  }
 }
 
 
@@ -58,56 +58,56 @@ 
  */
 function boincteam_import($boincteam, $nid = NULL) {
   
-  $input_format = variable_get('boincimport_input_format', 0);
-  $team_type_map = variable_get('boincimport_team_types', array()); 
+    $input_format = variable_get('boincimport_input_format', 0);
+    $team_type_map = variable_get('boincimport_team_types', array()); 
   
-  // Save the team type affiliation
-  $team_type_tid = $team_type_map[$boincteam->type];
+    // Save the team type affiliation
+    $team_type_tid = $team_type_map[$boincteam->type];
   
-  $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
-  // Be sure the text is filtered for the default input format
-  $boincteam->description = check_markup($boincteam->description, $input_format);
+    $boincteam->description = html_entity_decode($boincteam->description, ENT_QUOTES, 'utf-8');
+    // Be sure the text is filtered for the default input format
+    $boincteam->description = check_markup($boincteam->description, $input_format);
   
-  $teaser = node_teaser($boincteam->description);
+    $teaser = node_teaser($boincteam->description);
   
-  if ($nid) {
+    if ($nid) {
     // Update an existing node
     $node = node_load($nid);
     $node->title = $boincteam->name;
     $node->body = $boincteam->description;
     $node->teaser = $teaser;
     $node->uid = boincuser_lookup_uid($boincteam->userid);
-  }
-  else {
+    }
+    else {
     // Construct the team as a new node
     $node = array(
-      'type' => 'team',
-      'title' => $boincteam->name,
-      'body' => $boincteam->description,
-      'teaser' => $teaser,
-      'uid' => boincuser_lookup_uid($boincteam->userid),
-      'path' => null,
-      'status' => 1,  // published or not - always publish
-      'promote' => 0,
-      'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
-      'moderate' => 0,
-      'sticky' => 0,
-      'format' => $input_format
+        'type' => 'team',
+        'title' => $boincteam->name,
+        'body' => $boincteam->description,
+        'teaser' => $teaser,
+        'uid' => boincuser_lookup_uid($boincteam->userid),
+        'path' => null,
+        'status' => 1,  // published or not - always publish
+        'promote' => 0,
+        'created' => $boincteam->create_time,
+        'comment' => 0,  // comments disabled
+        'moderate' => 0,
+        'sticky' => 0,
+        'format' => $input_format
     );
     $node = (object) $node; // node_save requires an object form
-  }
+    }
   
-  $node->taxonomy[] = taxonomy_get_term($team_type_tid);
+    $node->taxonomy[] = taxonomy_get_term($team_type_tid);
   
-  // Save the team node
-  node_save($node);
-  $success = ($node->nid) ? TRUE : FALSE;
+    // Save the team node
+    node_save($node);
+    $success = ($node->nid) ? TRUE : FALSE;
   
-  if (!$nid) {
+    if (!$nid) {
     // Save the team IDs to a BOINC <--> Drupal reference table, if needed
     db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam->id, $node->nid);
-  }
+    }
   
-  return $success;
+    return $success;
 }

Spacing +3 added lines, -3 removed lines

@@ -87,15 +87,15 @@
       'teaser' => $teaser,
       'uid' => boincuser_lookup_uid($boincteam->userid),
       'path' => null,
-      'status' => 1,  // published or not - always publish
+      'status' => 1, // published or not - always publish
       'promote' => 0,
       'created' => $boincteam->create_time,
-      'comment' => 0,  // comments disabled
+      'comment' => 0, // comments disabled
       'moderate' => 0,
       'sticky' => 0,
       'format' => $input_format
     );
-    $node = (object) $node; // node_save requires an object form
+    $node = (object)$node; // node_save requires an object form
   }
   
   $node->taxonomy[] = taxonomy_get_term($team_type_tid);

Braces +2 added lines, -4 removed lines

@@ -44,8 +44,7 @@ 
         $nid = $existing_teams[$boinc_team->id];
         $success = boincteam_import($boinc_team, $nid);
       }
-    }
-    else {
+    } else {
       // Import new teams created by RPC or ops/team_import.php
       $success = boincteam_import($boinc_team);
     }
@@ -77,8 +76,7 @@ 
     $node->body = $boincteam->description;
     $node->teaser = $teaser;
     $node->uid = boincuser_lookup_uid($boincteam->userid);
-  }
-  else {
+  } else {
     // Construct the team as a new node
     $node = array(
       'type' => 'team',

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

@@ -37,7 +37,7 @@ 
   }
   
   while ($boinc_team = db_fetch_object($boinc_teams)) {
-    $success = NULL;
+    $success = null;
     if (isset($existing_teams[$boinc_team->id])) {
       if ($boinc_team->seti_id > 0) {
         // Sync BOINC-wide teams
@@ -56,7 +56,7 @@ 
 /**
  * Import a given BOINC team object into Drupal
  */
-function boincteam_import($boincteam, $nid = NULL) {
+function boincteam_import($boincteam, $nid = null) {
   
   $input_format = variable_get('boincimport_input_format', 0);
   $team_type_map = variable_get('boincimport_team_types', array()); 
@@ -102,7 +102,7 @@ 
   
   // Save the team node
   node_save($node);
-  $success = ($node->nid) ? TRUE : FALSE;
+  $success = ($node->nid) ? true : false;
   
   if (!$nid) {
     // Save the team IDs to a BOINC <--> Drupal reference table, if needed

drupal/sites/default/boinc/modules/boincteam/includes/boincteam_forum.forms.inc

Indentation +103 added lines, -103 removed lines

@@ -14,84 +14,84 @@ 
  * The definition of the create team form
  */
 function boincteam_forum_create_form(&$form_state) {
-  $form = array();
+    $form = array();
   
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  $default = array(
+    $default = array(
     'title' => '',
     'min_time_between_posts' => '',
     'min_total_credit_to_post' => '',
     'min_avg_credit_to_post' => '',
     'public' => 0,
     'description' => '',
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes'), 0 => bts('no')),
-  );
+    );
   
-  // Form elements
-  $form['title'] = array(
+    // Form elements
+    $form['title'] = array(
     '#title' => bts('Message board title'),
     '#type' => 'textfield',
     '#default_value' => $default['title'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags'),
-  );
-  $form['min_time_between_posts'] = array(
+    );
+    $form['min_time_between_posts'] = array(
     '#title' => bts('Minimum time between posts'),
     '#type' => 'textfield',
     '#default_value' => $default['min_time_between_posts'],
     '#size' => 12,
     '#description' => bts('Seconds'),
-  );
-  $form['min_total_credit_to_post'] = array(
+    );
+    $form['min_total_credit_to_post'] = array(
     '#title' => bts('Minimum total credit to post'),
     '#type' => 'textfield',
     '#default_value' => $default['min_total_credit_to_post'],
     '#size' => 12,
-  );
-  $form['min_avg_credit_to_post'] = array(
+    );
+    $form['min_avg_credit_to_post'] = array(
     '#title' => bts('Minimum avg credit to post'),
     '#type' => 'textfield',
     '#default_value' => $default['min_avg_credit_to_post'],
     '#size' => 12,
-  );
-  $form['public'] = array(
+    );
+    $form['public'] = array(
     '#title' => bts('Allow public to read board?'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['public'],
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Create message board'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
-  );
+    );
   
-  $form['#redirect'] = "community/teams/{$account->team}";
+    $form['#redirect'] = "community/teams/{$account->team}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -99,33 +99,33 @@ 
  */
 function boincteam_forum_create_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
+    $values = $form_state['values'];
   
-  if (!$values['title']) {
+    if (!$values['title']) {
     form_set_error('name', bts('Message board title is required.'));
-  }
-  if (!is_numeric($values['min_time_between_posts']) OR
+    }
+    if (!is_numeric($values['min_time_between_posts']) OR
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts',
-      bts('Please set the minimum time required between posts.')
+        bts('Please set the minimum time required between posts.')
     );
-  }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_total_credit_to_post']) OR
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
-      bts('Please set the minimum total credit that a user'
+        bts('Please set the minimum total credit that a user'
         . ' must earn in order to post to this message board.'
-      )
+        )
     );
-  }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_avg_credit_to_post']) OR
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post',
-      bts('Please set the minimum average credit that a user'
+        bts('Please set the minimum average credit that a user'
         . ' is required to have in order to post to this message board.'
-      )
+        )
     );
-  }
+    }
 }
 
 /**
@@ -133,13 +133,13 @@ 
  */
 function boincteam_forum_create_form_submit($form, &$form_state) {
   
-  $values = $form_state['values'];
+    $values = $form_state['values'];
   
-  global $user;
-  $account = user_load($user->uid);
+    global $user;
+    $account = user_load($user->uid);
   
-  // Add the team forum to the db
-  db_query("
+    // Add the team forum to the db
+    db_query("
     INSERT INTO {boincteam_forum} SET
       nid = %d,
       title = '%s',
@@ -157,9 +157,9 @@ 
     (int) $values['min_avg_credit_to_post'],
     ($values['public']) ? 1 : 0,
     $values['description']
-  );
+    );
   
-  drupal_set_message(t('Message board "@forum" has been created.',
+    drupal_set_message(t('Message board "@forum" has been created.',
     array('@forum' => $values['title'])));
 }
 
@@ -171,84 +171,84 @@ 
  * The definition of the edit team forum form
  */
 function boincteam_forum_edit_form(&$form_state, $tfid) {
-  $form = array();
-  $boincteam_forum = boincteam_forum_load($tfid);
+    $form = array();
+    $boincteam_forum = boincteam_forum_load($tfid);
   
-  $form_state['storage']['tfid'] = $tfid;
+    $form_state['storage']['tfid'] = $tfid;
   
-  $default = array(
+    $default = array(
     'title' => $boincteam_forum->title,
     'min_time_between_posts' => $boincteam_forum->min_time_between_posts,
     'min_total_credit_to_post' => $boincteam_forum->min_total_credit_to_post,
     'min_avg_credit_to_post' => $boincteam_forum->min_avg_credit_to_post,
     'public' => ($boincteam_forum->public) ? 1 : 0,
     'description' => $boincteam_forum->description,
-  );
+    );
   
-  // Standard option sets
-  $form['boolean_options'] = array(
+    // Standard option sets
+    $form['boolean_options'] = array(
     '#type' => 'value',
     '#value' => array(1 => bts('yes'), 0 => bts('no')),
-  );
+    );
   
-  // Form elements
-  $form['title'] = array(
+    // Form elements
+    $form['title'] = array(
     '#title' => bts('Message board title'),
     '#type' => 'textfield',
     '#default_value' => $default['title'],
     '#size' => 34,
     '#description' => bts('Text only, no HTML tags'),
-  );
-  $form['min_time_between_posts'] = array(
+    );
+    $form['min_time_between_posts'] = array(
     '#title' => bts('Minimum time between posts'),
     '#type' => 'textfield',
     '#default_value' => $default['min_time_between_posts'],
     '#size' => 12,
     '#description' => bts('Seconds'),
-  );
-  $form['min_total_credit_to_post'] = array(
+    );
+    $form['min_total_credit_to_post'] = array(
     '#title' => bts('Minimum total credit to post'),
     '#type' => 'textfield',
     '#default_value' => $default['min_total_credit_to_post'],
     '#size' => 12,
-  );
-  $form['min_avg_credit_to_post'] = array(
+    );
+    $form['min_avg_credit_to_post'] = array(
     '#title' => bts('Minimum avg credit to post'),
     '#type' => 'textfield',
     '#default_value' => $default['min_avg_credit_to_post'],
     '#size' => 12,
-  );
-  $form['public'] = array(
+    );
+    $form['public'] = array(
     '#title' => bts('Allow public to read board?'),
     '#type' => 'radios',
     '#options' => $form['boolean_options']['#value'],
     '#attributes' => array('class' => 'fancy'),
     '#default_value' => $default['public'],
-  );
-  $form['description'] = array(
+    );
+    $form['description'] = array(
     '#title' => bts('Description'),
     '#type' => 'textarea',
     '#default_value' => $default['description'],
     '#size' => 5,
-  );
+    );
   
-  // Form control
-  $form['form control tabs prefix'] = array(
+    // Form control
+    $form['form control tabs prefix'] = array(
     '#value' => '<ul class="form-control tab-list">'
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#prefix' => '<li class="first tab">',
     '#type' => 'submit',
     '#value' => bts('Save message board'),
     '#suffix' => '</li>',
-  );
-  $form['form control tabs'] = array(
+    );
+    $form['form control tabs'] = array(
     '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/forum', TRUE)) . '</li>'
-  );
+    );
   
-  $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
+    $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
   
-  return $form;
+    return $form;
 }
 
 /**
@@ -256,33 +256,33 @@ 
  */
 function boincteam_forum_edit_form_validate($form, &$form_state) {
 
-  $values = $form_state['values'];
+    $values = $form_state['values'];
   
-  if (!$values['title']) {
+    if (!$values['title']) {
     form_set_error('name', bts('Message board title is required.'));
-  }
-  if (!is_numeric($values['min_time_between_posts']) OR
+    }
+    if (!is_numeric($values['min_time_between_posts']) OR
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts', 
-      bts('Please set the minimum time required between posts.')
+        bts('Please set the minimum time required between posts.')
     );
-  }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_total_credit_to_post']) OR
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
-      bts('Please set the minimum total credit that a user'
+        bts('Please set the minimum total credit that a user'
         . ' must earn in order to post to this message board.'
-      )
+        )
     );
-  }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+    }
+    if (!is_numeric($values['min_avg_credit_to_post']) OR
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post', 
-      bts('Please set the minimum average credit that a user'
+        bts('Please set the minimum average credit that a user'
         . ' is required to have in order to post to this message board.'
-      )
+        )
     );
-  }
+    }
 }
 
 /**
@@ -290,11 +290,11 @@ 
  */
 function boincteam_forum_edit_form_submit($form, &$form_state) {
   
-  $tfid = $form_state['storage']['tfid'];
-  $values = $form_state['values'];
+    $tfid = $form_state['storage']['tfid'];
+    $values = $form_state['values'];
   
-  // Update the team forum in the db
-  db_query("
+    // Update the team forum in the db
+    db_query("
     UPDATE {boincteam_forum} SET
       title = '%s',
       min_time_between_posts = '%d',
@@ -311,11 +311,11 @@ 
     ($values['public']) ? 1 : 0,
     $values['description'],
     $tfid
-  );
+    );
   
-  drupal_set_message(t('Details for message board "@forum" have been updated.',
+    drupal_set_message(t('Details for message board "@forum" have been updated.',
     array('@forum' => $values['title'])));
   
-  // The storage variable quietly kills redirection for some reason... unset it
-  unset($form_state['storage']);
+    // The storage variable quietly kills redirection for some reason... unset it
+    unset($form_state['storage']);
 }

Spacing +8 added lines, -8 removed lines

@@ -86,7 +86,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel'), strstr($_GET['q'], '/forum/add', TRUE)).'</li>'
   );
   
   $form['#redirect'] = "community/teams/{$account->team}";
@@ -152,9 +152,9 @@ 
       updated = UNIX_TIMESTAMP()",
     $account->team,
     $values['title'],
-    (int) $values['min_time_between_posts'],
-    (int) $values['min_total_credit_to_post'],
-    (int) $values['min_avg_credit_to_post'],
+    (int)$values['min_time_between_posts'],
+    (int)$values['min_total_credit_to_post'],
+    (int)$values['min_avg_credit_to_post'],
     ($values['public']) ? 1 : 0,
     $values['description']
   );
@@ -243,7 +243,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/forum', TRUE)) . '</li>'
+    '#value' => '<li class="tab">'.l(bts('Cancel'), strstr($_GET['q'], '/forum', TRUE)).'</li>'
   );
   
   $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
@@ -305,9 +305,9 @@ 
       updated = UNIX_TIMESTAMP()
     WHERE tfid='%d'",
     $values['title'],
-    (int) $values['min_time_between_posts'],
-    (int) $values['min_total_credit_to_post'],
-    (int) $values['min_avg_credit_to_post'],
+    (int)$values['min_time_between_posts'],
+    (int)$values['min_total_credit_to_post'],
+    (int)$values['min_avg_credit_to_post'],
     ($values['public']) ? 1 : 0,
     $values['description'],
     $tfid

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

@@ -86,7 +86,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/forum/add', true)) . '</li>'
   );
   
   $form['#redirect'] = "community/teams/{$account->team}";
@@ -104,13 +104,13 @@ 
   if (!$values['title']) {
     form_set_error('name', bts('Message board title is required.'));
   }
-  if (!is_numeric($values['min_time_between_posts']) OR
+  if (!is_numeric($values['min_time_between_posts']) or
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts',
       bts('Please set the minimum time required between posts.')
     );
   }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+  if (!is_numeric($values['min_total_credit_to_post']) or
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
       bts('Please set the minimum total credit that a user'
@@ -118,7 +118,7 @@ 
       )
     );
   }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+  if (!is_numeric($values['min_avg_credit_to_post']) or
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post',
       bts('Please set the minimum average credit that a user'
@@ -243,7 +243,7 @@ 
     '#suffix' => '</li>',
   );
   $form['form control tabs'] = array(
-    '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/forum', TRUE)) . '</li>'
+    '#value' => '<li class="tab">' . l(bts('Cancel'), strstr($_GET['q'], '/forum', true)) . '</li>'
   );
   
   $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
@@ -261,13 +261,13 @@ 
   if (!$values['title']) {
     form_set_error('name', bts('Message board title is required.'));
   }
-  if (!is_numeric($values['min_time_between_posts']) OR
+  if (!is_numeric($values['min_time_between_posts']) or
       $values['min_time_between_posts'] < 0) {
     form_set_error('min_time_between_posts', 
       bts('Please set the minimum time required between posts.')
     );
   }
-  if (!is_numeric($values['min_total_credit_to_post']) OR
+  if (!is_numeric($values['min_total_credit_to_post']) or
       $values['min_total_credit_to_post'] < 0) {
     form_set_error('min_total_credit_to_post',
       bts('Please set the minimum total credit that a user'
@@ -275,7 +275,7 @@ 
       )
     );
   }
-  if (!is_numeric($values['min_avg_credit_to_post']) OR
+  if (!is_numeric($values['min_avg_credit_to_post']) or
       $values['min_avg_credit_to_post'] < 0) {
     form_set_error('min_avg_credit_to_post', 
       bts('Please set the minimum average credit that a user'

drupal/sites/default/boinc/modules/boincteam/boincteam_forum.module

Indentation +121 added lines, -121 removed lines

@@ -25,29 +25,29 @@ 
  * Implementation of hook_menu()
  */
 function boincteam_forum_menu() {
-  $items = array();
+    $items = array();
 
-  return $items;
+    return $items;
 }
 
 /**
 * Implementation of hook_form_alter()
 */
 function boincteam_forum_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
-  // Team forum node edit form
-  case 'team_forum_node_form':
+    switch ($form_id) {
+    // Team forum node edit form
+    case 'team_forum_node_form':
     
     // Internal fields to indicate where these changes are taking place
     array_unshift($form, array(
-      'tfid' => array(
+        'tfid' => array(
         '#type' => 'hidden',
         '#value' => arg(3),
-      ),
+        ),
     ));
     break;
   
-  default:
+    default:
   }
 }
 
@@ -56,26 +56,26 @@ 
  * Obsolete in Drupal 7...
  */
 function boincteam_forum_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
-  // In Drupal 7, these operation cases will all exist as their own hooks,
-  // so let's approximate that here so that this function can simply be removed
-  // upon migration to 7
-  switch($op) {
-  case 'insert':
+    // In Drupal 7, these operation cases will all exist as their own hooks,
+    // so let's approximate that here so that this function can simply be removed
+    // upon migration to 7
+    switch($op) {
+    case 'insert':
     boincteam_forum_node_insert($node);
     break;
-  case 'load':
+    case 'load':
     boincteam_forum_node_load($node);
     break;
-  case 'update':
+    case 'update':
     boincteam_forum_node_update($node);
     break;
-  case 'validate':
+    case 'validate':
     boincteam_forum_node_validate($node);
     break;
-  case 'view':
+    case 'view':
     boincteam_forum_node_view($node);
     break;
-  default:
+    default:
   }
 }
 
@@ -84,21 +84,21 @@ 
  * is inserted (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_insert($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $account = user_load($node->uid);
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     if ($account->team == $team_id) {
-      db_query("
+        db_query("
         INSERT INTO {boincteam_forum_node} SET
           nid = %d,
           tfid = %d",
         $node->nid, $node->tfid
-      );
+        );
     }
     unset($node->tfid);
     break;
-  default:
+    default:
   }
 }
 
@@ -107,15 +107,15 @@ 
  * is loaded (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_load($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $node->tfid = db_result(db_query("
       SELECT tfid FROM {boincteam_forum_node}
       WHERE nid = %d", $node->nid
     ));
     break;
     
-  default:
+    default:
     
   }
 }
@@ -125,12 +125,12 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_update($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     
     break;
     
-  default:
+    default:
     
   }
 }
@@ -140,8 +140,8 @@ 
  * is validated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_validate($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $account = user_load($node->uid);
     // Get tfid from node, but if empty/null, get it from the database
     if (!($node->tfid)) {
@@ -154,11 +154,11 @@ 
     }
     $team_id = boincteam_forum_lookup_nid($tfid);
     if (!$account->team OR $account->team != $team_id) {
-      drupal_set_message(t('Failed to add team forum topic.'), 'error');
-      drupal_goto('community/forum');
+        drupal_set_message(t('Failed to add team forum topic.'), 'error');
+        drupal_goto('community/forum');
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -167,19 +167,19 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_view($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     $public_forum = boincteam_forum_is_public($node->tfid);
     $is_member = boincteam_is_member($team_id);
     $is_global_moderator = boincteam_forum_is_global_moderator();
     if (!$public_forum AND !$is_member AND !$is_global_moderator) {
-      drupal_not_found();
-      module_invoke_all('exit');
-      exit();
+        drupal_not_found();
+        module_invoke_all('exit');
+        exit();
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -187,17 +187,17 @@ 
 * Implementation of hook_views_api().
 */
 function boincteam_forum_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincteam_forum')
-  );
+    );
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincteam_forum_perm() {
-  return array('manage boincteam forum');
+    return array('manage boincteam forum');
 }
 
 
@@ -209,43 +209,43 @@ 
  * Check if the user has global access to moderate team forums
  */
 function boincteam_forum_is_global_moderator() {
-  global $user;
-  return user_access('manage boincteam forum');
+    global $user;
+    return user_access('manage boincteam forum');
 }
 
 /*
  * Check if any forums for a team are public
  */
 function boincteam_forum_is_any_public($team_id) {
-  $forums = boincteam_forum_list($team_id);
-  foreach ($forums as $forum) {
+    $forums = boincteam_forum_list($team_id);
+    foreach ($forums as $forum) {
     if ($forum->public) {
-      return TRUE;
+        return TRUE;
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /*
  * Check if a team forum should be visible to everyone
  */
 function boincteam_forum_is_public($tfid) {
-  return db_result(db_query("
+    return db_result(db_query("
     SELECT public FROM {boincteam_forum} WHERE tfid=%d", $tfid
-  ));
+    ));
 }
 
 /*
  * Load the forums for a team, if any exist
  */
 function boincteam_forum_list($team_id = NULL) {
-  if (!$team_id) {
+    if (!$team_id) {
     global $user;
     $account = user_load($user->uid);
     $team_id = $account->team;
-  }
-  $team_forums = array();
-  if ($team_id) {
+    }
+    $team_forums = array();
+    if ($team_id) {
     // Load any team forum objects for the user's team
     $result = db_query("
       SELECT tfid, nid, title, description, created, updated, public,
@@ -255,26 +255,26 @@ 
     $row = 0;
     while ($team_forum = db_fetch_object($result)) {
       
-      $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
-      $team_forum->zebra = $row % 2 ? 'even' : 'odd';
-      $team_forum->new_topics = 0; // TODO: Track user views of team topics
-      $team_forum->new_text = '';
-      $team_forum->new_url = '';
-      $team_forum->num_topics = db_result(db_query("
+        $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
+        $team_forum->zebra = $row % 2 ? 'even' : 'odd';
+        $team_forum->new_topics = 0; // TODO: Track user views of team topics
+        $team_forum->new_text = '';
+        $team_forum->new_url = '';
+        $team_forum->num_topics = db_result(db_query("
         SELECT COUNT(nid) FROM {boincteam_forum_node}
         WHERE tfid = %d",
         $team_forum->tfid
-      ));
-      $team_forum->num_posts = db_result(db_query("
+        ));
+        $team_forum->num_posts = db_result(db_query("
         SELECT COALESCE(SUM(ncs.comment_count),0) + COUNT(ncs.nid)
         FROM {boincteam_forum_node} bfn
         JOIN {node_comment_statistics} ncs ON ncs.nid = bfn.nid
         JOIN {node} n ON n.nid = ncs.nid
         WHERE bfn.tfid = %d AND n.status = 1",
         $team_forum->tfid
-      ));
-      $last_post = new stdClass();
-      $last_post->timestamp = db_result(db_query("
+        ));
+        $last_post = new stdClass();
+        $last_post->timestamp = db_result(db_query("
         SELECT ncs.last_comment_timestamp FROM {node} n
         INNER JOIN {boincteam_forum_node} bfn
         INNER JOIN {node_comment_statistics} ncs ON n.nid = bfn.nid AND n.nid = ncs.nid
@@ -282,36 +282,36 @@ 
         ORDER BY ncs.last_comment_timestamp DESC
         LIMIT 1",
         $team_forum->tfid
-      ));
-      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
-      $team_forums[$team_forum->tfid] = $team_forum;
-      $row++;
+        ));
+        $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
+        $team_forums[$team_forum->tfid] = $team_forum;
+        $row++;
     }
-  }
-  return $team_forums;
+    }
+    return $team_forums;
 }
 
 /*
  * Load a team forum by ID
  */
 function boincteam_forum_load($tfid) {
-  // Load any team forum objects for the user's team
-  $result = db_query("
+    // Load any team forum objects for the user's team
+    $result = db_query("
     SELECT tfid, nid, title, description, created, updated, public,
       min_time_between_posts, min_total_credit_to_post, min_avg_credit_to_post
     FROM {boincteam_forum} WHERE tfid=%d", $tfid
-  );
-  return db_fetch_object($result);
+    );
+    return db_fetch_object($result);
 }
 
 /*
  * Look up the team ID for a given team forum
  */
 function boincteam_forum_lookup_nid($tfid) {
-  return db_result(db_query("
+    return db_result(db_query("
     SELECT nid FROM {boincteam_forum}
     WHERE tfid=%d", $tfid
-  ));
+    ));
 }
 
 
@@ -323,80 +323,80 @@ 
  * Create team forum form
  */
 function boincteam_forum_create_form_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create team message board')
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create team message board')
     . '</h2>';
-  $output .= drupal_get_form('boincteam_forum_create_form');
+    $output .= drupal_get_form('boincteam_forum_create_form');
   
-  return $output;
+    return $output;
 }
 
 /**
  * Edit team forum form
  */
 function boincteam_forum_edit_form_panel($tfid) {
-  $team_forum = boincteam_forum_load($tfid);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Edit message board') . ': ' . 
+    $team_forum = boincteam_forum_load($tfid);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Edit message board') . ': ' . 
     $team_forum->title . '</h2>';
-  $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
+    $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
   
-  return $output;
+    return $output;
 }
 
 /**
  * Link to team forums
  */
 function boincteam_forum_link_panel($team_id) {
-  $show_public_only = (
+    $show_public_only = (
     !boincteam_is_member($team_id) AND
     !boincteam_forum_is_global_moderator()
-  );
-  $forums = boincteam_forum_list($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Team forum') . '</h2>';
-  $output .= '<p>'
+    );
+    $forums = boincteam_forum_list($team_id);
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Team forum') . '</h2>';
+    $output .= '<p>'
     . bts('A discussion forum has been set up for team members.')
     . '</p>';
-  $output .= '<ul class="tab-list action-list">';
-  foreach ($forums as $forum) {
+    $output .= '<ul class="tab-list action-list">';
+    foreach ($forums as $forum) {
     if (!$show_public_only OR $forum->public) {
-      $output .= '  <li class="tab primary">' . 
+        $output .= '  <li class="tab primary">' . 
         l(
-          //$forum->title,
-          bts('Enter forum'),
-          "community/teams/{$team_id}/forum/{$forum->tfid}"
+            //$forum->title,
+            bts('Enter forum'),
+            "community/teams/{$team_id}/forum/{$forum->tfid}"
         ) . '</li>';
-      // Since we're only supporting one team forum for now, we've labeled the
-      // link in a generic way above and will now just break out of the loop
-      break;
+        // Since we're only supporting one team forum for now, we've labeled the
+        // link in a generic way above and will now just break out of the loop
+        break;
     }
-  }
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * General info about team forums
  */                                         
 function boincteam_forum_topic_overview_panel($nid = NULL) {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About message boards') . '</h2>';
-  $output .= '<div>';
-  if ($nid) {
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('About message boards') . '</h2>';
+    $output .= '<div>';
+    if ($nid) {
     $team = node_load($nid);
     $output .= '<p>' . bts('You may create a message board for use by @team',
-      array('@team' => $team->title)) . ':</p>';
-  }
-  else {
+        array('@team' => $team->title)) . ':</p>';
+    }
+    else {
     $output .= '<p>' . bts('This is a team-only message board') . ':</p>';
-  }
-  $output .= '<ul>';
-  $output .= '  <li>' . bts('Only members may post') . '</li>';
-  $output .= '  <li>' . bts('Only members may read (optional)') . '</li>';
-  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges') .
+    }
+    $output .= '<ul>';
+    $output .= '  <li>' . bts('Only members may post') . '</li>';
+    $output .= '  <li>' . bts('Only members may read (optional)') . '</li>';
+    $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges') .
     '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }

Spacing +20 added lines, -20 removed lines

@@ -59,7 +59,7 @@ 
   // In Drupal 7, these operation cases will all exist as their own hooks,
   // so let's approximate that here so that this function can simply be removed
   // upon migration to 7
-  switch($op) {
+  switch ($op) {
   case 'insert':
     boincteam_forum_node_insert($node);
     break;
@@ -84,7 +84,7 @@ 
  * is inserted (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_insert($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $account = user_load($node->uid);
     $team_id = boincteam_forum_lookup_nid($node->tfid);
@@ -107,7 +107,7 @@ 
  * is loaded (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_load($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $node->tfid = db_result(db_query("
       SELECT tfid FROM {boincteam_forum_node}
@@ -125,7 +125,7 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_update($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     
     break;
@@ -140,7 +140,7 @@ 
  * is validated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_validate($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $account = user_load($node->uid);
     // Get tfid from node, but if empty/null, get it from the database
@@ -167,7 +167,7 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_view($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     $public_forum = boincteam_forum_is_public($node->tfid);
@@ -256,7 +256,7 @@ 
     while ($team_forum = db_fetch_object($result)) {
       
       $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
-      $team_forum->zebra = $row % 2 ? 'even' : 'odd';
+      $team_forum->zebra = $row%2 ? 'even' : 'odd';
       $team_forum->new_topics = 0; // TODO: Track user views of team topics
       $team_forum->new_text = '';
       $team_forum->new_url = '';
@@ -324,7 +324,7 @@ 
  */
 function boincteam_forum_create_form_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create team message board')
+  $output .= '<h2 class="pane-title">'.bts('Create team message board')
     . '</h2>';
   $output .= drupal_get_form('boincteam_forum_create_form');
   
@@ -337,8 +337,8 @@ 
 function boincteam_forum_edit_form_panel($tfid) {
   $team_forum = boincteam_forum_load($tfid);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Edit message board') . ': ' . 
-    $team_forum->title . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Edit message board').': '. 
+    $team_forum->title.'</h2>';
   $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
   
   return $output;
@@ -354,19 +354,19 @@ 
   );
   $forums = boincteam_forum_list($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Team forum') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Team forum').'</h2>';
   $output .= '<p>'
     . bts('A discussion forum has been set up for team members.')
     . '</p>';
   $output .= '<ul class="tab-list action-list">';
   foreach ($forums as $forum) {
     if (!$show_public_only OR $forum->public) {
-      $output .= '  <li class="tab primary">' . 
+      $output .= '  <li class="tab primary">'. 
         l(
           //$forum->title,
           bts('Enter forum'),
           "community/teams/{$team_id}/forum/{$forum->tfid}"
-        ) . '</li>';
+        ).'</li>';
       // Since we're only supporting one team forum for now, we've labeled the
       // link in a generic way above and will now just break out of the loop
       break;
@@ -381,20 +381,20 @@ 
  */                                         
 function boincteam_forum_topic_overview_panel($nid = NULL) {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About message boards') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('About message boards').'</h2>';
   $output .= '<div>';
   if ($nid) {
     $team = node_load($nid);
-    $output .= '<p>' . bts('You may create a message board for use by @team',
-      array('@team' => $team->title)) . ':</p>';
+    $output .= '<p>'.bts('You may create a message board for use by @team',
+      array('@team' => $team->title)).':</p>';
   }
   else {
-    $output .= '<p>' . bts('This is a team-only message board') . ':</p>';
+    $output .= '<p>'.bts('This is a team-only message board').':</p>';
   }
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Only members may post') . '</li>';
-  $output .= '  <li>' . bts('Only members may read (optional)') . '</li>';
-  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges') .
+  $output .= '  <li>'.bts('Only members may post').'</li>';
+  $output .= '  <li>'.bts('Only members may read (optional)').'</li>';
+  $output .= '  <li>'.bts('Founder & Team Admins have moderator privileges').
     '</li>';
   $output .= '</ul>';
   $output .= '</div>';

Braces +1 added lines, -2 removed lines

@@ -387,8 +387,7 @@
     $team = node_load($nid);
     $output .= '<p>' . bts('You may create a message board for use by @team',
       array('@team' => $team->title)) . ':</p>';
-  }
-  else {
+  } else {
     $output .= '<p>' . bts('This is a team-only message board') . ':</p>';
   }
   $output .= '<ul>';

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

@@ -153,7 +153,7 @@ 
         $tfid = $node->tfid;
     }
     $team_id = boincteam_forum_lookup_nid($tfid);
-    if (!$account->team OR $account->team != $team_id) {
+    if (!$account->team or $account->team != $team_id) {
       drupal_set_message(t('Failed to add team forum topic.'), 'error');
       drupal_goto('community/forum');
     }
@@ -173,7 +173,7 @@ 
     $public_forum = boincteam_forum_is_public($node->tfid);
     $is_member = boincteam_is_member($team_id);
     $is_global_moderator = boincteam_forum_is_global_moderator();
-    if (!$public_forum AND !$is_member AND !$is_global_moderator) {
+    if (!$public_forum and !$is_member and !$is_global_moderator) {
       drupal_not_found();
       module_invoke_all('exit');
       exit();
@@ -220,10 +220,10 @@ 
   $forums = boincteam_forum_list($team_id);
   foreach ($forums as $forum) {
     if ($forum->public) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
 /*
@@ -238,7 +238,7 @@ 
 /*
  * Load the forums for a team, if any exist
  */
-function boincteam_forum_list($team_id = NULL) {
+function boincteam_forum_list($team_id = null) {
   if (!$team_id) {
     global $user;
     $account = user_load($user->uid);
@@ -283,7 +283,7 @@ 
         LIMIT 1",
         $team_forum->tfid
       ));
-      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
+      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : null);
       $team_forums[$team_forum->tfid] = $team_forum;
       $row++;
     }
@@ -349,7 +349,7 @@ 
  */
 function boincteam_forum_link_panel($team_id) {
   $show_public_only = (
-    !boincteam_is_member($team_id) AND
+    !boincteam_is_member($team_id) and
     !boincteam_forum_is_global_moderator()
   );
   $forums = boincteam_forum_list($team_id);
@@ -360,7 +360,7 @@ 
     . '</p>';
   $output .= '<ul class="tab-list action-list">';
   foreach ($forums as $forum) {
-    if (!$show_public_only OR $forum->public) {
+    if (!$show_public_only or $forum->public) {
       $output .= '  <li class="tab primary">' . 
         l(
           //$forum->title,
@@ -379,7 +379,7 @@ 
 /**
  * General info about team forums
  */                                         
-function boincteam_forum_topic_overview_panel($nid = NULL) {
+function boincteam_forum_topic_overview_panel($nid = null) {
   $output = '';
   $output .= '<h2 class="pane-title">' . bts('About message boards') . '</h2>';
   $output .= '<div>';