BOINC / boinc

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

Braces +36 added lines, -42 removed lines

@@ -108,8 +108,7 @@ 
      foreach($this->Data as $Key => $Settings)
       {
        if ( isset($Settings["Connections"]) )
-        { $this->Data[$Key]["FreeZone"] = count($Settings["Connections"])*10 + 20; }
-       else
+        { $this->Data[$Key]["FreeZone"] = count($Settings["Connections"])*10 + 20; } else
         { $this->Data[$Key]["FreeZone"] = 20; }
       }
 
@@ -200,11 +199,12 @@ 
       {
        if ( is_array($Connections ) )
         {
-         foreach($Connections as $Key => $Value)
-          $this->Data[$NodeID]["Connections"][] = $Value;
-        }
-       else
-        $this->Data[$NodeID]["Connections"][] = $Connections;
+         foreach($Connections as $Key => $Value) {
+                   $this->Data[$NodeID]["Connections"][] = $Value;
+         }
+        } else {
+               $this->Data[$NodeID]["Connections"][] = $Connections;
+       }
       }
     }
 
@@ -228,8 +228,7 @@ 
            if ( isset($Settings["Surrounding"]) ) { $this->Data[$NodeID]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
           }
         }
-      }
-     else
+      } else
       {
        if ( isset($Settings["R"]) ) { $this->Data[$Nodes]["R"] = $Settings["R"]; }
        if ( isset($Settings["G"]) ) { $this->Data[$Nodes]["G"] = $Settings["G"]; }
@@ -301,8 +300,9 @@ 
       {
        if ( isset($Settings["Connections"]) )
         {
-         foreach($Settings["Connections"] as $ID => $ConnectionID)
-          $this->checkConnection($ConnectionID,$Key);
+         foreach($Settings["Connections"] as $ID => $ConnectionID) {
+                   $this->checkConnection($ConnectionID,$Key);
+         }
         }
       }
 
@@ -321,8 +321,7 @@ 
          if ( $Settings["Type"] == NODE_TYPE_FREE )
           {
            if ( isset($Settings["Connections"]) )
-            { $Connections = count($Settings["Connections"]); }
-           else
+            { $Connections = count($Settings["Connections"]); } else
             { $Connections = 0; }
 
            $Ring  = $MaxConnections - $Connections;
@@ -332,16 +331,16 @@ 
            $this->Data[$Key]["Y"] = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
           }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_CENTRAL )
+      } elseif ( $Algorithm == ALGORITHM_CENTRAL )
       {
        /* Put a weight on each nodes */
        foreach($this->Data as $Key => $Settings)
         {
-         if ( isset($Settings["Connections"]) )
-          $this->Data[$Key]["Weight"] = count($Settings["Connections"]);
-         else
-          $this->Data[$Key]["Weight"] = 0;
+         if ( isset($Settings["Connections"]) ) {
+                   $this->Data[$Key]["Weight"] = count($Settings["Connections"]);
+         } else {
+                   $this->Data[$Key]["Weight"] = 0;
+         }
         }
 
        $MaxConnections = $MaxConnections + 1;
@@ -353,8 +352,7 @@ 
            if ( $Settings["Type"] == NODE_TYPE_FREE )
             {
              if ( isset($Settings["Connections"]) )
-              { $Connections = count($Settings["Connections"]); }
-             else
+              { $Connections = count($Settings["Connections"]); } else
               { $Connections = 0; }
 
              if ( $Connections == $i )
@@ -389,8 +387,7 @@ 
             }
           }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_CIRCULAR )
+      } elseif ( $Algorithm == ALGORITHM_CIRCULAR )
       {
        $MaxConnections = $MaxConnections + 1;
        for($i=$MaxConnections;$i>=0;$i--)
@@ -401,8 +398,7 @@ 
            if ( $Settings["Type"] == NODE_TYPE_FREE )
             {
              if ( isset($Settings["Connections"]) )
-              { $Connections = count($Settings["Connections"]); }
-             else
+              { $Connections = count($Settings["Connections"]); } else
               { $Connections = 0; }
 
              if ( $Connections == $i )
@@ -421,8 +417,7 @@ 
             }
           }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_RANDOM )
+      } elseif ( $Algorithm == ALGORITHM_RANDOM )
       {
        foreach($this->Data as $Key => $Settings)
         {
@@ -485,13 +480,14 @@ 
                $Distance = $this->getDistance($X1,$Y1,$X2,$Y2);
                $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2);
 
-               if ( $Distance > $FreeZone )
-                $Force = log(($Distance-$FreeZone)+1);
-               else
+               if ( $Distance > $FreeZone ) {
+                               $Force = log(($Distance-$FreeZone)+1);
+               } else
                 { $Force = log(($FreeZone-$Distance)+1); ($Angle = $Angle + 180); }
 
-               if ( $Force > 1 )
-                $this->Data[$Key]["Vectors"][] = array("Type"=>"A","Angle"=>$Angle % 360,"Force"=>$Force);
+               if ( $Force > 1 ) {
+                               $this->Data[$Key]["Vectors"][] = array("Type"=>"A","Angle"=>$Angle % 360,"Force"=>$Force);
+               }
               }
             }
           }
@@ -719,10 +715,11 @@ 
                  $TxtX  = ($X2 - $X)/2 + $X;
                  $TxtY  = ($Y2 - $Y)/2 + $Y;
 
-                 if ( $X <= $X2 )
-                  $Angle = (360-$this->getAngle($X,$Y,$X2,$Y2)) % 360;
-                 else
-                  $Angle = (360-$this->getAngle($X2,$Y2,$X,$Y)) % 360;
+                 if ( $X <= $X2 ) {
+                                   $Angle = (360-$this->getAngle($X,$Y,$X2,$Y2)) % 360;
+                 } else {
+                                   $Angle = (360-$this->getAngle($X2,$Y2,$X,$Y)) % 360;
+                 }
 
                  $Settings          = $Color;
                  $Settings["Angle"] = $Angle;
@@ -764,16 +761,14 @@ 
        if ( $Shape == NODE_SHAPE_CIRCLE )
         {
          $this->pChartObject->drawFilledCircle($X,$Y,$Size,$Color);
-        }
-       elseif ( $Shape == NODE_SHAPE_TRIANGLE )
+        } elseif ( $Shape == NODE_SHAPE_TRIANGLE )
         {
          $Points = "";
          $Points[] = cos(deg2rad(270)) * $Size + $X; $Points[] = sin(deg2rad(270)) * $Size + $Y;
          $Points[] = cos(deg2rad(45)) * $Size + $X;  $Points[] = sin(deg2rad(45)) * $Size + $Y;
          $Points[] = cos(deg2rad(135)) * $Size + $X; $Points[] = sin(deg2rad(135)) * $Size + $Y;
          $this->pChartObject->drawPolygon($Points,$Color);
-        }
-       elseif ( $Shape == NODE_SHAPE_SQUARE )
+        } elseif ( $Shape == NODE_SHAPE_SQUARE )
         {
          $Offset = $Size/2; $Size = $Size / 2;
          $this->pChartObject->drawFilledRectangle($X-$Offset,$Y-$Offset,$X+$Offset,$Y+$Offset,$Color);
@@ -787,8 +782,7 @@ 
           {
            $LabelOptions["Align"] = TEXT_ALIGN_BOTTOMLEFT;
            $this->pChartObject->drawText($X,$Y,$Name,$LabelOptions);
-          }
-         elseif ( $this->Labels["Type"] == LABEL_CLASSIC )
+          } elseif ( $this->Labels["Type"] == LABEL_CLASSIC )
           {
            $LabelOptions["Align"]         = TEXT_ALIGN_TOPMIDDLE;
            $LabelOptions["DrawBox"]       = TRUE;

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

Braces +506 added lines, -559 removed lines

@@ -169,22 +169,24 @@ 
       {
        $Points = $Backup;
 
-       if ( $NoFill )
-        $BorderSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
-       else
-        $BorderSettings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+       if ( $NoFill ) {
+               $BorderSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+       } else {
+               $BorderSettings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+       }
 
        for($i=0;$i<=count($Points)-1;$i=$i+2)
         {
          if ( isset($Points[$i+2]) )
           {
-           if ( !($Points[$i] == $Points[$i+2] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[$i+3] && $Points[$i+1] == $SkipY ) )
-            $this->drawLine($Points[$i],$Points[$i+1],$Points[$i+2],$Points[$i+3],$BorderSettings);
-          }
-         else
+           if ( !($Points[$i] == $Points[$i+2] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[$i+3] && $Points[$i+1] == $SkipY ) ) {
+                       $this->drawLine($Points[$i],$Points[$i+1],$Points[$i+2],$Points[$i+3],$BorderSettings);
+           }
+          } else
           {
-           if ( !($Points[$i] == $Points[0] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[1] && $Points[$i+1] == $SkipY ) )
-            $this->drawLine($Points[$i],$Points[$i+1],$Points[0],$Points[1],$BorderSettings);
+           if ( !($Points[$i] == $Points[0] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[1] && $Points[$i+1] == $SkipY ) ) {
+                       $this->drawLine($Points[$i],$Points[$i+1],$Points[0],$Points[1],$BorderSettings);
+           }
           }
         }
       }
@@ -236,8 +238,7 @@ 
        $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
        $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
        $this->drawLine($X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
-      }
-     else
+      } else
       {
        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
        imageline($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
@@ -318,8 +319,7 @@ 
        $Xp1++;
 
        if ( !isset($Positions[$Yp]) )
-        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
-       else
+        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; } else
         { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
 
        $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
@@ -332,8 +332,7 @@ 
        $Xp1++;
 
        if ( !isset($Positions[$Yp]) )
-        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
-       else
+        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; } else
         { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
       }
 
@@ -407,8 +406,9 @@ 
        if ( $this->getFirstDecimal($Xp2) > 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
        if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
 
-       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
-        imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
+       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 ) {
+               imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
+       }
 
        $Drawn[$Yp+$YOffset] = $Xp2;
 
@@ -420,8 +420,9 @@ 
        if ( $this->getFirstDecimal($Xp2) > 7 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
        if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
 
-       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
-        imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
+       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 ) {
+               imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
+       }
 
        $Drawn[$Yp+$YOffset] = $Xp2;
       }
@@ -452,16 +453,14 @@ 
          $this->drawLine($X2,$Y1+1,$X2,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X1,$Y1+1,$X1,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-        }
-       else
+        } else
         {
          $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
          $this->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
         }
-      }
-     else
+      } else
       {
        $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
        imagerectangle($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
@@ -507,9 +506,9 @@ 
        imagefilledrectangle($this->Picture,ceil($X1)+1,ceil($Y1),floor($X2)-1,floor($Y2),$Color);
        imageline($this->Picture,ceil($X1),ceil($Y1)+1,ceil($X1),floor($Y2)-1,$Color);
        imageline($this->Picture,floor($X2),ceil($Y1)+1,floor($X2),floor($Y2)-1,$Color);
-      }
-     else
-      imagefilledrectangle($this->Picture,ceil($X1),ceil($Y1),floor($X2),floor($Y2),$Color);
+      } else {
+           imagefilledrectangle($this->Picture,ceil($X1),ceil($Y1),floor($X2),floor($Y2),$Color);
+     }
 
      if ( $Dash )
       {
@@ -557,8 +556,9 @@ 
         }
       }
 
-     if ( $BorderR != -1 )
-      $this->drawRectangle($X1,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
+     if ( $BorderR != -1 ) {
+           $this->drawRectangle($X1,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
+     }
 
      $this->Shadow = $RestoreShadow;
     }
@@ -596,8 +596,7 @@ 
 
        /* First segment */
        if ( $i == 1 )
-        { $Xv1 = $X1; $Yv1 = $Y1; }
-       else
+        { $Xv1 = $X1; $Yv1 = $Y1; } else
         {
          $Angle1 = $this->getAngle($XLast,$YLast,$X1,$Y1);
          $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
@@ -610,8 +609,7 @@ 
 
        /* Last segment */
        if ( $i == count($Coordinates)-1 )
-        { $Xv2 = $X2; $Yv2 = $Y2; }
-       else
+        { $Xv2 = $X2; $Yv2 = $Y2; } else
         {
          $Angle1 = $this->getAngle($X2,$Y2,$Coordinates[$i+1][0],$Coordinates[$i+1][1]);
          $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
@@ -653,9 +651,9 @@ 
       {
        $Length    = $this->getLength($X1,$Y1,$X2,$Y2);
        $Precision = ($Length*125)/1000;
-      }
-     else
-      $Precision = $Segments;
+      } else {
+           $Precision = $Segments;
+     }
 
      $P[0]["X"] = $X1;  $P[0]["Y"] = $Y1;
      $P[1]["X"] = $Xv1; $P[1]["Y"] = $Yv1;
@@ -714,8 +712,9 @@ 
          if ( $ArrowS == NULL && $LastX != NULL && $LastY != NULL )
           { $ArrowS["X2"] = $LastX; $ArrowS["Y2"] = $LastY; $ArrowS["X1"] = $X; $ArrowS["Y1"] = $Y; }
 
-         if ( $LastX != NULL && $LastY != NULL && !$PathOnly)
-          list($Cpt,$Mode) = $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Cpt"=>$Cpt,"Mode"=>$Mode,"Weight"=>$Weight));
+         if ( $LastX != NULL && $LastY != NULL && !$PathOnly) {
+                   list($Cpt,$Mode) = $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Cpt"=>$Cpt,"Mode"=>$Mode,"Weight"=>$Weight));
+         }
 
          /* Get the last segment */
          $ArrowE["X1"] = $LastX; $ArrowE["Y1"] = $LastY; $ArrowE["X2"] = $X; $ArrowE["Y2"] = $Y;
@@ -726,8 +725,9 @@ 
        if ( $DrawArrow && !$PathOnly )
         {
          $ArrowSettings = array("FillR"=>$R,"FillG"=>$G,"FillB"=>$B,"Alpha"=>$Alpha,"Size"=>$ArrowSize,"Ratio"=>$ArrowRatio);
-         if ( $ArrowTwoHeads )
-          $this->drawArrow($ArrowS["X1"],$ArrowS["Y1"],$ArrowS["X2"],$ArrowS["Y2"],$ArrowSettings);
+         if ( $ArrowTwoHeads ) {
+                   $this->drawArrow($ArrowS["X1"],$ArrowS["Y1"],$ArrowS["X2"],$ArrowS["Y2"],$ArrowSettings);
+         }
 
          $this->drawArrow($ArrowE["X1"],$ArrowE["Y1"],$ArrowE["X2"],$ArrowE["Y2"],$ArrowSettings);
         }
@@ -779,8 +779,7 @@ 
          $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y2;
 
          $this->drawPolygon($Points,$PolySettings);
-        }
-       else
+        } else
         {
          for($i=0;$i<=$Distance;$i=$i+$Ticks*2)
           {
@@ -830,13 +829,14 @@ 
          if ( $Cpt % $Ticks == 0 )
           { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
 
-         if ( $Mode == 1 )
-          $this->drawAntialiasPixel($X,$Y,$Color);
+         if ( $Mode == 1 ) {
+                   $this->drawAntialiasPixel($X,$Y,$Color);
+         }
 
          $Cpt++;
-        }
-       else
-        $this->drawAntialiasPixel($X,$Y,$Color);
+        } else {
+               $this->drawAntialiasPixel($X,$Y,$Color);
+       }
       }
 
      return(array($Cpt,$Mode));
@@ -882,13 +882,14 @@ 
          if ( $Cpt % $Ticks == 0 )
           { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
 
-         if ( $Mode == 1 )
-          $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+         if ( $Mode == 1 ) {
+                   $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+         }
 
          $Cpt++;
-        }
-       else
-        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+        } else {
+               $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+       }
 
       }
      $this->Shadow = $RestoreShadow;
@@ -934,13 +935,15 @@ 
        $this->Mask[$X+$XPos][$YPos] = TRUE;
        imageline($this->Picture,$X-$XPos,$YPos,$X+$XPos,$YPos,$Color);
       }
-     if ( $this->Antialias )
-      $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+     if ( $this->Antialias ) {
+           $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+     }
 
      $this->Mask = "";
 
-     if ( $BorderR != -1 )
-      $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks));
+     if ( $BorderR != -1 ) {
+           $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks));
+     }
 
      $this->Shadow	= $RestoreShadow;
     }
@@ -1005,8 +1008,7 @@ 
        $Settings = array("R"=>$BoxR,"G"=>$BoxG,"B"=>$BoxB,"Alpha"=>$BoxAlpha,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"BorderAlpha"=>$BoxBorderAlpha);
 
        if ( $BoxRounded )
-        { $this->drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$RoundedRadius,$Settings); }
-       else
+        { $this->drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$RoundedRadius,$Settings); } else
         { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Settings); }
       }
 
@@ -1116,8 +1118,9 @@ 
      $B     = isset($Format["B"]) ? $Format["B"] : 0;
      $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
 
-     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
-      return(-1);
+     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize ) {
+           return(-1);
+     }
 
      if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
      if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
@@ -1143,12 +1146,12 @@ 
 
      if ( $Xi == $X && $Yi == $Y)
       {
-       if ( $Alpha == 100 )
-        $this->drawAlphaPixel($X,$Y,100,$R,$G,$B);
-       else
-        $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
-      }
-     else
+       if ( $Alpha == 100 ) {
+               $this->drawAlphaPixel($X,$Y,100,$R,$G,$B);
+       } else {
+               $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
+       }
+      } else
       {
        $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
        if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
@@ -1169,8 +1172,9 @@ 
     {
      if ( isset($this->Mask[$X])) { if ( isset($this->Mask[$X][$Y]) ) { return(0); } }
 
-     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
-      return(-1);
+     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize ) {
+           return(-1);
+     }
 
      if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
      if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
@@ -1238,12 +1242,9 @@ 
        list($Width,$Height) = $this->getPicInfo($FileName);
 
        if ( $PicType == 1 )
-        { $Raster = imagecreatefrompng($FileName); }
-       elseif ( $PicType == 2 )
-        { $Raster = imagecreatefromgif($FileName); }
-       elseif ( $PicType == 3 )
-        { $Raster = imagecreatefromjpeg($FileName); }
-       else
+        { $Raster = imagecreatefrompng($FileName); } elseif ( $PicType == 2 )
+        { $Raster = imagecreatefromgif($FileName); } elseif ( $PicType == 3 )
+        { $Raster = imagecreatefromjpeg($FileName); } else
         { return(0); }
 
 
@@ -1251,9 +1252,9 @@ 
        if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
         {
          $this->Shadow = FALSE;
-         if ( $PicType == 3 )
-          $this->drawFilledRectangle($X+$this->ShadowX,$Y+$this->ShadowY,$X+$Width+$this->ShadowX,$Y+$Height+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
-         else
+         if ( $PicType == 3 ) {
+                   $this->drawFilledRectangle($X+$this->ShadowX,$Y+$this->ShadowY,$X+$Width+$this->ShadowX,$Y+$Height+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+         } else
           {
            $TranparentID = imagecolortransparent($Raster);
            for ($Xc=0;$Xc<=$Width-1;$Xc++)
@@ -1351,9 +1352,9 @@ 
        $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
 
        $this->drawLine($TailX,$TailY,$TailX2,$TailY2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-      }
-     else
-      $this->drawLine($X1,$Y1,$TailX,$TailY,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+      } else {
+           $this->drawLine($X1,$Y1,$TailX,$TailY,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+     }
 
      /* Re-enable shadows */
      $this->Shadow = $RestoreShadow;
@@ -1395,18 +1396,19 @@ 
      if ( $Angle > 0 && $Angle < 180 )
       {
        $this->drawLine($X2,$Y2,$X2-$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-       if ( $Position == POSITION_TOP )
-        $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_BOTTOMRIGHT));
-       else
-        $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPRIGHT));
-      }
-     else
+       if ( $Position == POSITION_TOP ) {
+               $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_BOTTOMRIGHT));
+       } else {
+               $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPRIGHT));
+       }
+      } else
       {
        $this->drawLine($X2,$Y2,$X2+$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
-       if ( $Position == POSITION_TOP )
-        $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
-       else
-        $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPLEFT));
+       if ( $Position == POSITION_TOP ) {
+               $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+       } else {
+               $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPLEFT));
+       }
       }
     }
 
@@ -1463,11 +1465,12 @@ 
          $GradientOptions = array("StartR"=>$RFade,"StartG"=>$GFade,"StartB"=>$BFade,"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
          $this->drawGradientArea($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,DIRECTION_VERTICAL,$GradientOptions);
 
-         if ( $Surrounding )
-          $this->drawRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
-        }
-       else
-        $this->drawFilledRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+         if ( $Surrounding ) {
+                   $this->drawRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
+         }
+        } else {
+               $this->drawFilledRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+       }
 
        $this->Shadow = $RestoreShadow;
 
@@ -1475,13 +1478,13 @@ 
        if ( $ShowLabel && $LabelPos == LABEL_POS_TOP )		{ $this->drawText($X+($Width/2),$Y-$Height-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
        if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+($Width/2),$Y-$InnerHeight-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT,"Angle"=>90)); }
        if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y-($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"Angle"=>90)); }
-      }
-     else
+      } else
       {
-       if ( $Percent == 100 )
-        $InnerWidth = $Width-1;
-       else
-        $InnerWidth = (($Width-2)/100)*$Percent;
+       if ( $Percent == 100 ) {
+               $InnerWidth = $Width-1;
+       } else {
+               $InnerWidth = (($Width-2)/100)*$Percent;
+       }
 
        $this->drawFilledRectangle($X,$Y,$X+$Width,$Y+$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
 
@@ -1491,11 +1494,12 @@ 
          $GradientOptions = array("StartR"=>$R,"StartG"=>$G,"StartB"=>$B,"EndR"=>$RFade,"EndG"=>$GFade,"EndB"=>$BFade);
          $this->drawGradientArea($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,DIRECTION_HORIZONTAL,$GradientOptions);
 
-         if ( $Surrounding )
-          $this->drawRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
-        }
-       else
-        $this->drawFilledRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+         if ( $Surrounding ) {
+                   $this->drawRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
+         }
+        } else {
+               $this->drawFilledRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+       }
  
        $this->Shadow = $RestoreShadow;
 
@@ -1554,8 +1558,7 @@ 
 
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
+          } elseif ( $Mode == LEGEND_HORIZONTAL )
           {
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $Width = "";
@@ -1644,8 +1647,7 @@ 
 
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
+          } elseif ( $Mode == LEGEND_HORIZONTAL )
           {
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $Width = "";
@@ -1669,10 +1671,11 @@ 
      $TopOffset  = $Y - $Boundaries["T"];
      if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
 
-     if ( $Style == LEGEND_ROUND )
-      $this->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-     elseif ( $Style == LEGEND_BOX )
-      $this->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     if ( $Style == LEGEND_ROUND ) {
+           $this->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     } elseif ( $Style == LEGEND_BOX ) {
+           $this->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     }
 
      $RestoreShadow = $this->Shadow; $this->Shadow = FALSE;
      foreach($Data["Series"] as $SerieName => $Serie)
@@ -1689,8 +1692,7 @@ 
            $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
 
            $this->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
-          }
-         else
+          } else
           {
            if ( $Family == LEGEND_FAMILY_BOX )
             {
@@ -1699,13 +1701,11 @@ 
 
              $this->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_CIRCLE )
+            } elseif ( $Family == LEGEND_FAMILY_CIRCLE )
             {
              $this->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_LINE )
+            } elseif ( $Family == LEGEND_FAMILY_LINE )
             {
              $this->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
              $this->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
@@ -1715,12 +1715,12 @@ 
          if ( $Mode == LEGEND_VERTICAL )
           {
            $Lines = preg_split("/\n/",$Serie["Description"]);
-           foreach($Lines as $Key => $Value)
-            $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+           foreach($Lines as $Key => $Value) {
+                       $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+           }
 
            $Y=$Y+max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
+          } elseif ( $Mode == LEGEND_HORIZONTAL )
           {
            $Lines = preg_split("/\n/",$Serie["Description"]);
            $Width = "";
@@ -1829,12 +1829,9 @@ 
        if ( $AxisParameter["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
 
        if ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_Y)
-        { $Height = $this->GraphAreaY2-$this->GraphAreaY1 - $YMargin*2; }
-       elseif ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_X)
-        { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
-       elseif ( $Pos == SCALE_POS_TOPBOTTOM && $AxisParameter["Identity"] == AXIS_Y)
-        { $Height = $this->GraphAreaX2-$this->GraphAreaX1 - $YMargin*2;; }
-       else
+        { $Height = $this->GraphAreaY2-$this->GraphAreaY1 - $YMargin*2; } elseif ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_X)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1; } elseif ( $Pos == SCALE_POS_TOPBOTTOM && $AxisParameter["Identity"] == AXIS_Y)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1 - $YMargin*2;; } else
         { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
 
        $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
@@ -1852,18 +1849,15 @@ 
 
          $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
          if ( $Mode == SCALE_MODE_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
-        }
-       elseif ( $Mode == SCALE_MODE_MANUAL )
+        } elseif ( $Mode == SCALE_MODE_MANUAL )
         {
          if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
           {
            $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
            $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
-          }
-         else
+          } else
           { echo "Manual scale boundaries not set."; exit(); }
-        }
-       elseif ( $Mode == SCALE_MODE_ADDALL || $Mode == SCALE_MODE_ADDALL_START0 )
+        } elseif ( $Mode == SCALE_MODE_ADDALL || $Mode == SCALE_MODE_ADDALL_START0 )
         {
          $Series = "";
          foreach($Data["Series"] as $SerieID => $SerieParameter)
@@ -1911,12 +1905,12 @@ 
        if ( $Abscissa != NULL )
         {
          $Points = count($Data["Series"][$Abscissa]["Data"]);
-         if ( $AutoAxisLabels )
-          $AxisName = isset($Data["Series"][$Abscissa]["Description"]) ? $Data["Series"][$Abscissa]["Description"] : NULL;
-         else
-          $AxisName = NULL;
-        }
-       else
+         if ( $AutoAxisLabels ) {
+                   $AxisName = isset($Data["Series"][$Abscissa]["Description"]) ? $Data["Series"][$Abscissa]["Description"] : NULL;
+         } else {
+                   $AxisName = NULL;
+         }
+        } else
         {
          $Points = 0;
          $AxisName = isset($Data["XAxisName"]) ? $Data["XAxisName"] : NULL;
@@ -1931,16 +1925,15 @@ 
        if ( $XMargin == AUTO )
         {
          if ( $Pos == SCALE_POS_LEFTRIGHT )
-          { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
-         else
+          { $Height = $this->GraphAreaX2-$this->GraphAreaX1; } else
           { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
 
-         if ( $Points == 1 )
-          $Data["Axis"][$AxisID]["Margin"] = $Height / 2;
-         else
-          $Data["Axis"][$AxisID]["Margin"] = ($Height/$Points) / 2;
-        }
-       else
+         if ( $Points == 1 ) {
+                   $Data["Axis"][$AxisID]["Margin"] = $Height / 2;
+         } else {
+                   $Data["Axis"][$AxisID]["Margin"] = ($Height/$Points) / 2;
+         }
+        } else
         { $Data["Axis"][$AxisID]["Margin"] = $XMargin; }
        $Data["Axis"][$AxisID]["Rows"] = $Points-1;
        if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
@@ -1952,8 +1945,7 @@ 
      if ( $Pos != SCALE_POS_LEFTRIGHT )
       {
        if ( $Data["AbsicssaPosition"] == AXIS_POSITION_BOTTOM )
-        { $Data["AbsicssaPosition"] = AXIS_POSITION_LEFT; }
-       else
+        { $Data["AbsicssaPosition"] = AXIS_POSITION_LEFT; } else
         { $Data["AbsicssaPosition"] = AXIS_POSITION_RIGHT; }
       }
      $Data["Axis"][$AxisID]["Position"] = $Data["AbsicssaPosition"];
@@ -1972,8 +1964,7 @@ 
          $AxisR = $Parameters["Color"]["R"]; $AxisG = $Parameters["Color"]["G"]; $AxisB = $Parameters["Color"]["B"];
          $TickR = $Parameters["Color"]["R"]; $TickG = $Parameters["Color"]["G"]; $TickB = $Parameters["Color"]["B"];
          $this->setFontProperties(array("R"=>$Parameters["Color"]["R"],"G"=>$Parameters["Color"]["G"],"B"=>$Parameters["Color"]["B"]));
-        }
-       else
+        } else
         {
          $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
          $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
@@ -1995,8 +1986,7 @@ 
              if ( !$RemoveXAxis )
               {
                if ( $Floating )
-                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
                 { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2013,13 +2003,13 @@ 
                $YPos  = $AxisPos["B"];
 
                if ( $Abscissa != NULL )
-                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } } else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) ) {
+                                   $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                 } else {
+                                   $Value = $i;
+                 }
                 }
 
                $ID++; $Skipped = TRUE;
@@ -2038,8 +2028,7 @@ 
                 {
                  if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
                  if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$SkippedInnerTickWidth,$XPos,$YPos+$SkippedOuterTickWidth,$SkippedTickColor); }
-                }
-               else
+                } else
                 {
                  if ( $DrawXLines && ($XPos != $this->GraphAreaX1 && $XPos != $this->GraphAreaX2) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
                  if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$InnerTickWidth,$XPos,$YPos+$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
@@ -2057,8 +2046,7 @@ 
               }
 
              $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
-            }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_TOP )
+            } elseif ( $Parameters["Position"] == AXIS_POSITION_TOP )
             {
              if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 2; }
              if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
@@ -2068,8 +2056,7 @@ 
              if ( !$RemoveXAxis )
               {
                if ( $Floating )
-                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
                 { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
                if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2086,13 +2073,13 @@ 
                $YPos  = $AxisPos["T"];
 
                if ( $Abscissa != NULL )
-                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } } else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) ) {
+                                   $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                 } else {
+                                   $Value = $i;
+                 }
                 }
 
                $ID++; $Skipped = TRUE;
@@ -2111,8 +2098,7 @@ 
                 {
                  if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
                  if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$SkippedInnerTickWidth,$XPos,$YPos-$SkippedOuterTickWidth,$SkippedTickColor); }
-                }
-               else
+                } else
                 {
                  if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
                  if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$InnerTickWidth,$XPos,$YPos-$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
@@ -2132,8 +2118,7 @@ 
 
              $AxisPos["T"] = $MinTop - $ScaleSpacing;
             }
-          }
-         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
+          } elseif ( $Pos == SCALE_POS_TOPBOTTOM )
           {
            if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
             {
@@ -2145,8 +2130,7 @@ 
              if ( !$RemoveXAxis )
               {
                if ( $Floating )
-                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
                 { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
                if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2163,13 +2147,13 @@ 
                $XPos  = $AxisPos["L"];
 
                if ( $Abscissa != NULL )
-                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } } else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) ) {
+                                   $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                 } else {
+                                   $Value = $i;
+                 }
                 }
 
                $ID++; $Skipped = TRUE;
@@ -2188,8 +2172,7 @@ 
                 {
                  if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
                  if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$SkippedOuterTickWidth,$YPos,$XPos+$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
-                }
-               else
+                } else
                 {
                  if ( $DrawXLines && ($YPos != $this->GraphAreaY1 && $YPos != $this->GraphAreaY2) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
                  if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
@@ -2207,8 +2190,7 @@ 
               }
 
              $AxisPos["L"] = $MinLeft - $ScaleSpacing;
-            }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
+            } elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
             {
              if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 2; }
              if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 6; }
@@ -2218,8 +2200,7 @@ 
              if ( !$RemoveXAxis )
               {
                if ( $Floating )
-                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-               else
+                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
                 { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
                if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2236,13 +2217,13 @@ 
                $XPos  = $AxisPos["R"];
 
                if ( $Abscissa != NULL )
-                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
-               else
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } } else
                 {
-                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
-                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
-                 else
-                  $Value = $i;
+                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) ) {
+                                   $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                 } else {
+                                   $Value = $i;
+                 }
                 }
 
                $ID++; $Skipped = TRUE;
@@ -2261,8 +2242,7 @@ 
                 {
                  if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
                  if ( ($SkippedInnerTickWidth != 0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$SkippedOuterTickWidth,$YPos,$XPos-$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
-                }
-               else
+                } else
                 {
                  if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
                  if ( ($InnerTickWidth != 0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$OuterTickWidth,$YPos,$XPos-$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
@@ -2295,8 +2275,7 @@ 
             {
 
              if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
+              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
               { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2315,8 +2294,9 @@ 
 
                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
-                $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+               if ( $DrawSubTicks && $i != $Parameters["Rows"] ) {
+                               $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+               }
 
                $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
                $Bounds  = $this->drawText($XPos-$OuterTickWidth-2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
@@ -2337,12 +2317,10 @@ 
               }
 
              $AxisPos["L"] = $MinLeft - $ScaleSpacing;
-            }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
+            } elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
             {
              if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
+              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
               { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2361,8 +2339,9 @@ 
 
                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
-                $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+               if ( $DrawSubTicks && $i != $Parameters["Rows"] ) {
+                               $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+               }
 
                $this->drawLine($XPos-$InnerTickWidth,$YPos,$XPos+$OuterTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
                $Bounds  = $this->drawText($XPos+$OuterTickWidth+2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
@@ -2383,14 +2362,12 @@ 
               }
              $AxisPos["R"] = $MaxLeft + $ScaleSpacing;
             }
-          }
-         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
+          } elseif ( $Pos == SCALE_POS_TOPBOTTOM )
           {
            if ( $Parameters["Position"] == AXIS_POSITION_TOP )
             {
              if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
+              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
               { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2409,8 +2386,9 @@ 
 
                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
-                $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+               if ( $DrawSubTicks && $i != $Parameters["Rows"] ) {
+                               $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+               }
 
                $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
                $Bounds    = $this->drawText($XPos,$YPos-$OuterTickWidth-2,$Value,array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
@@ -2431,12 +2409,10 @@ 
               }
 
              $AxisPos["T"] = $MinTop - $ScaleSpacing;
-            }
-           elseif ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
+            } elseif ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
             {
              if ( $Floating )
-              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-             else
+              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
               { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
              if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -2455,8 +2431,9 @@ 
 
                if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
-                $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+               if ( $DrawSubTicks && $i != $Parameters["Rows"] ) {
+                               $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+               }
 
                $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
                $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+2,$Value,array("Align"=>TEXT_ALIGN_TOPMIDDLE));
@@ -2498,8 +2475,9 @@ 
     {
      /* Compute each factors */
      $Results = "";
-     foreach ($Factors as $Key => $Factor)
-      $Results[$Factor] = $this->processScale($XMin,$XMax,$MaxDivs,array($Factor),$AxisID);
+     foreach ($Factors as $Key => $Factor) {
+           $Results[$Factor] = $this->processScale($XMin,$XMax,$MaxDivs,array($Factor),$AxisID);
+     }
 
      /* Remove scales that are creating to much decimals */
      $GoodScaleFactors = "";
@@ -2526,15 +2504,17 @@ 
     {
      $ScaleHeight = abs(ceil($XMax)-floor($XMin));
 
-     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Format"]) )
-      $Format = $this->DataSet->Data["Axis"][$AxisID]["Format"];
-     else
-      $Format = NULL;
+     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Format"]) ) {
+           $Format = $this->DataSet->Data["Axis"][$AxisID]["Format"];
+     } else {
+           $Format = NULL;
+     }
 
-     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Display"]) )
-      $Mode = $this->DataSet->Data["Axis"][$AxisID]["Display"];
-     else
-      $Mode = AXIS_FORMAT_DEFAULT;
+     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Display"]) ) {
+           $Mode = $this->DataSet->Data["Axis"][$AxisID]["Display"];
+     } else {
+           $Mode = AXIS_FORMAT_DEFAULT;
+     }
 
      $Scale = "";
      if ( $XMin != $XMax )
@@ -2589,8 +2569,7 @@ 
 
          $Scale["Format"] = $GoodDecimals;
         }
-      }
-     else
+      } else
       {
        /* If all values are the same we keep a +1/-1 scale */
        $Rows = 2; $XMin = $XMax-1; $XMax = $XMax+1; $RowHeight = 1;
@@ -2673,13 +2652,14 @@ 
       {
        if ( isset($Data["Abscissa"]) )
         {
-         if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$Value]) )
-          $Caption = $Data["Series"][$Data["Abscissa"]]["Data"][$Value];
-         else
-          $Caption = $Value;
-        }
-       else
-        $Caption = $Value;
+         if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$Value]) ) {
+                   $Caption = $Data["Series"][$Data["Abscissa"]]["Data"][$Value];
+         } else {
+                   $Caption = $Value;
+         }
+        } else {
+               $Caption = $Value;
+       }
       }
 
      if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
@@ -2702,8 +2682,7 @@ 
          if ( $WriteCaption )
           {
            if ( $CaptionAlign == CAPTION_LEFT_TOP )
-            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-           else 
+            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; } else 
             { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
            
            $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
@@ -2711,8 +2690,7 @@ 
 
          return(array("X"=>$XPos));
         }
-      }
-     elseif( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+      } elseif( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
       {
        $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
        $XPos  = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value;
@@ -2732,8 +2710,7 @@ 
          if ( $WriteCaption )
           {
            if ( $CaptionAlign == CAPTION_LEFT_TOP )
-            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-           else 
+            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; } else 
             { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
            
            $this->drawText($Y,$XPos,$Caption,$CaptionSettings);
@@ -2813,8 +2790,7 @@ 
 
        $this->Shadow = $RestoreShadow;
        return(array("X1"=>$XPos1,"X2"=>$XPos2));
-      }
-     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+      } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
       {
        $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
        $XPos1 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value1;
@@ -2919,8 +2895,7 @@ 
          if ( $WriteCaption )
           {
            if ( $CaptionAlign == CAPTION_LEFT_TOP )
-            { $X = $X1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-           else 
+            { $X = $X1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; } else 
             { $X = $X2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
            
            $this->drawText($X,$YPos,$Caption,$CaptionSettings);
@@ -2949,8 +2924,7 @@ 
          if ( $WriteCaption )
           {
            if ( $CaptionAlign == CAPTION_LEFT_TOP )
-            { $Y = $Y1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-           else 
+            { $Y = $Y1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; } else 
             { $Y = $Y2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
 
            $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
@@ -3028,8 +3002,7 @@ 
 
        $this->Shadow = $RestoreShadow;
        return(array("Y1"=>$YPos1,"Y2"=>$YPos2));
-      }
-     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+      } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
       {
        $YPos1 = $this->GraphAreaY1 + $AbscissaMargin;
        $YPos2 = $this->GraphAreaY2 - $AbscissaMargin;
@@ -3102,26 +3075,24 @@ 
        $Step        = $Height / $ScaleHeight;
 
        if ( $ReturnOnly0Height )
-        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
-       else
+        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } } else
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
-      }
-     else
+      } else
       {
        $Width      = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleWidth = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
        $Step       = $Width / $ScaleWidth;
 
        if ( $ReturnOnly0Height )
-        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
-       else
+        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } } else
         { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
       }
 
-     if ( count($Result) == 1 )
-      return($Result[0]);
-     else
-      return($Result);
+     if ( count($Result) == 1 ) {
+           return($Result[0]);
+     } else {
+           return($Result);
+     }
     }
 
    /* Format the axis values */
@@ -3143,12 +3114,14 @@ 
 
      if ( $Mode == AXIS_FORMAT_METRIC )
       {
-       if (abs($Value) > 1000000000)
-        return(round($Value/1000000000,$Format)."g".$Unit);
-       if (abs($Value) > 1000000)
-        return(round($Value/1000000,$Format)."m".$Unit);
-       elseif (abs($Value) >= 1000)
-        return(round($Value/1000,$Format)."k".$Unit);
+       if (abs($Value) > 1000000000) {
+               return(round($Value/1000000000,$Format)."g".$Unit);
+       }
+       if (abs($Value) > 1000000) {
+               return(round($Value/1000000,$Format)."m".$Unit);
+       } elseif (abs($Value) >= 1000) {
+               return(round($Value/1000,$Format)."k".$Unit);
+       }
        
       }
      return($Value.$Unit);
@@ -3264,8 +3237,7 @@ 
 
              $this->drawText($XPos+$XOffset,$YPos-$DisplayOffset+$YOffset,$Label,$CaptionSettings);
             }
-          }
-         else
+          } else
           {
            $XStep       = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs;
            $X           = $this->GraphAreaY1 + $XMargin;
@@ -3351,8 +3323,7 @@ 
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
          if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
          if ( isset($Serie["Picture"]) )
-          { $Picture = $Serie["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->getPicInfo($Picture); }
-         else { $Picture = NULL; $PicOffset = 0; }
+          { $Picture = $Serie["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->getPicInfo($Picture); } else { $Picture = NULL; $PicOffset = 0; }
 
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
@@ -3377,22 +3348,21 @@ 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            foreach($PosArray as $Key => $Y)
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X,$Y-$DisplayOffset-$SerieWeight-$BorderSize-$PicOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             if ( $DisplayValues ) {
+                           $this->drawText($X,$Y-$DisplayOffset-$SerieWeight-$BorderSize-$PicOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             }
 
              if ( $Y != VOID )
               {
                if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
                if ( $Picture != NULL )
-                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
-               else
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); } else
                 { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
               }
              $X = $X + $XStep;
             }
-          }
-         else
+          } else
           {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            if ( $Picture != NULL ) { $PicOffset = $PicWidth / 2; $SerieWeight = 0; }
@@ -3401,16 +3371,16 @@ 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            foreach($PosArray as $Key => $X)
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X+$DisplayOffset+$SerieWeight+$BorderSize+$PicOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             if ( $DisplayValues ) {
+                           $this->drawText($X+$DisplayOffset+$SerieWeight+$BorderSize+$PicOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             }
 
              if ( $X != VOID )
               {
                if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
                if ( $Picture != NULL )
-                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
-               else
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); } else
                 { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
               }
              $Y = $Y + $YStep;
@@ -3447,10 +3417,11 @@ 
         {
          $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
 
-         if ( $BreakR == NULL )
-          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks);
-         else
-          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         if ( $BreakR == NULL ) {
+                   $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks);
+         } else {
+                   $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         }
 
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
@@ -3475,8 +3446,9 @@ 
            $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
            foreach($PosArray as $Key => $Y)
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             if ( $DisplayValues ) {
+                           $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             }
 	
              if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
@@ -3486,8 +3458,9 @@ 
              if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
               { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
 
-             if ( $Y != VOID )
-              $WayPoints[] = array($X,$Y);
+             if ( $Y != VOID ) {
+                           $WayPoints[] = array($X,$Y);
+             }
 
              if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
              if ( $Y == VOID ) { $Y = NULL; }
@@ -3496,8 +3469,7 @@ 
              $X = $X + $XStep;
             }
            $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
-          }
-         else
+          } else
           {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
@@ -3507,8 +3479,9 @@ 
            $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
            foreach($PosArray as $Key => $X)
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             if ( $DisplayValues ) {
+                           $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             }
 
              if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
@@ -3518,8 +3491,9 @@ 
              if ( $X != VOID && $LastX == NULL && $LastGoodX != NULL && !$BreakVoid )
               { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
 
-             if ( $X != VOID )
-              $WayPoints[] = array($X,$Y);
+             if ( $X != VOID ) {
+                           $WayPoints[] = array($X,$Y);
+             }
 
              if ( $X != VOID ) { $LastGoodX = $X; $LastGoodY = $Y; }
              if ( $X == VOID ) { $X = NULL; }
@@ -3589,8 +3563,9 @@ 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            foreach($PosArray as $Key => $Y)
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             if ( $DisplayValues ) {
+                           $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             }
 
              if ( $Y == VOID )
               {
@@ -3614,9 +3589,10 @@ 
                 }
 
                $WayPoints = "";
-              }
-             else
-              $WayPoints[] = array($X,$Y-.5); /* -.5 for AA visual fix */
+              } else {
+                           $WayPoints[] = array($X,$Y-.5);
+             }
+             /* -.5 for AA visual fix */
 
              $X = $X + $XStep;
             }
@@ -3638,8 +3614,7 @@ 
               }
              $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
             }
-          }
-         else
+          } else
           {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
@@ -3652,8 +3627,9 @@ 
            if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
            foreach($PosArray as $Key => $X)
             {
-             if ( $DisplayValues ) 
-              $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             if ( $DisplayValues ) {
+                           $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+             }
 
              if ( $X == VOID )
               {
@@ -3677,9 +3653,9 @@ 
                 }
 
                $WayPoints = "";
-              }
-             else
-              $WayPoints[] = array($X,$Y);
+              } else {
+                           $WayPoints[] = array($X,$Y);
+             }
 
              $Y = $Y + $YStep;
             }
@@ -3742,10 +3718,11 @@ 
          if ( $ForceColor )
           { $R = $ForceR; $G = $ForceG; $B = $ForceB; $Alpha = $ForceAlpha; }
 
-         if ( $BreakR == NULL )
-          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-         else
-          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         if ( $BreakR == NULL ) {
+                   $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         } else {
+                   $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         }
 
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
@@ -3777,8 +3754,9 @@ 
 
              if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
-              $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+             if ( $Y != VOID && $LastX != NULL && $LastY != NULL ) {
+                           $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+             }
 
              if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
               { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
@@ -3789,8 +3767,7 @@ 
              $LastX = $X; $LastY = $Y;
              $X = $X + $XStep;
             }
-          }
-         else
+          } else
           {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
@@ -3804,8 +3781,9 @@ 
 
              if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
-              $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+             if ( $X != VOID && $LastX != NULL && $LastY != NULL ) {
+                           $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+             }
 
              if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
               { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
@@ -3879,8 +3857,7 @@ 
          $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
          $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
         }
-      }
-     else
+      } else
       {
        if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
        $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
@@ -3940,10 +3917,11 @@ 
 
          if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
 
-         if ( $BreakR == NULL )
-          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
-         else
-          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         if ( $BreakR == NULL ) {
+                   $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         } else {
+                   $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         }
 
          if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
 
@@ -3980,8 +3958,7 @@ 
                 {
                  $this->drawLine($X,$Y,$X+$XStep,$Y,$Color);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
+                } else
                 { if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); } }
               }
 
@@ -3991,8 +3968,7 @@ 
                 {
                  $this->drawLine($LastGoodX+$XStep,$LastGoodY,$X,$LastGoodY,$BreakSettings);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX+$XStep-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
+                } else
                 {
                  $this->drawLine($LastGoodX,$LastGoodY,$X,$LastGoodY,$BreakSettings);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
@@ -4000,8 +3976,7 @@ 
 
                $this->drawLine($X,$LastGoodY,$X,$Y,$BreakSettings);
                $LastGoodY = NULL;
-              }
-             elseif( !$BreakVoid && $LastGoodY == NULL && $Y != VOID )
+              } elseif( !$BreakVoid && $LastGoodY == NULL && $Y != VOID )
               {
               $this->drawLine($this->GraphAreaX1 + $XMargin,$Y,$X,$Y,$BreakSettings);
                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($this->GraphAreaX1+$XMargin-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
@@ -4020,8 +3995,7 @@ 
              $this->drawLine($LastX,$LastY,$this->GraphAreaX2 - $XMargin,$LastY,$Color);
              if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($this->GraphAreaX2-$XMargin+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
             }
-          }
-         else
+          } else
           {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
@@ -4054,8 +4028,7 @@ 
 
                $this->drawLine($LastGoodX,$Y,$X,$Y,$BreakSettings);
                $LastGoodY = NULL;
-              }
-             elseif ( $X != VOID && $LastGoodY == NULL && !$BreakVoid )
+              } elseif ( $X != VOID && $LastGoodY == NULL && !$BreakVoid )
               {
                $this->drawLine($X,$this->GraphAreaY1 + $XMargin,$X,$Y,$BreakSettings);
                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($this->GraphAreaY1+$XMargin-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
@@ -4161,13 +4134,11 @@ 
             {
              $Points[] = $LastX+$XStep/2; $Points[] = $LastY;
              $Points[] = $LastX+$XStep/2; $Points[] = $YZero;
-            }
-           else
+            } else
             { $Points[] = $LastX; $Points[] = $YZero; }
 
            $this->drawPolygon($Points,$Color);
-          }
-         else
+          } else
           {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
@@ -4209,8 +4180,7 @@ 
             {
              $Points[] = $LastX; $Points[] = $LastY+$YStep/2;
              $Points[] = $YZero; $Points[] = $LastY+$YStep/2;
-            }
-           else
+            } else
             { $Points[] = $YZero; $Points[] = $LastY; }
 
            $this->drawPolygon($Points,$Color);
@@ -4286,14 +4256,12 @@ 
              if ( $Y == VOID && isset($Areas[$AreaID]) )
               {
                if($LastX == NULL)
-                { $Areas[$AreaID][] = $X; }
-               else
+                { $Areas[$AreaID][] = $X; } else
                 { $Areas[$AreaID][] = $LastX; }
 
                if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
                $AreaID++;
-              }
-             elseif ($Y != VOID)
+              } elseif ($Y != VOID)
               {
                if ( !isset($Areas[$AreaID]) )
                 {
@@ -4321,23 +4289,23 @@ 
                foreach($Points as $Key2 => $Value)
                 {
                  if ( $Key2 % 2 == 0 )
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
-                 else
+                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; } else
                   { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
                 }
               }              
 
-             foreach($ShadowArea as $Key => $Points)
-              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+             foreach($ShadowArea as $Key => $Points) {
+                           $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+             }
             }
 
            $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
 
-           foreach($Areas as $Key => $Points)
-            $this->drawPolygonChart($Points,$Color);
-          }
-         else
+           foreach($Areas as $Key => $Points) {
+                       $this->drawPolygonChart($Points,$Color);
+           }
+          } else
           {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
@@ -4363,13 +4331,11 @@ 
                if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
 
                if($LastY == NULL)
-                { $Areas[$AreaID][] = $Y; }
-               else
+                { $Areas[$AreaID][] = $Y; } else
                 { $Areas[$AreaID][] = $LastY; }
 
                $AreaID++;
-              }
-             elseif ($X != VOID)
+              } elseif ($X != VOID)
               {
                if ( !isset($Areas[$AreaID]) )
                 {
@@ -4397,21 +4363,22 @@ 
                foreach($Points as $Key2 => $Value)
                 {
                  if ( $Key2 % 2 == 0 )
-                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
-                 else
+                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; } else
                   { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
                 }
               }              
 
-             foreach($ShadowArea as $Key => $Points)
-              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+             foreach($ShadowArea as $Key => $Points) {
+                           $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+             }
             }
 
            $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
 
-           foreach($Areas as $Key => $Points)
-            $this->drawPolygonChart($Points,$Color);
+           foreach($Areas as $Key => $Points) {
+                       $this->drawPolygonChart($Points,$Color);
+           }
           }
         }
       }
@@ -4497,8 +4464,7 @@ 
          $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
 
          if ( $Floating0Value != NULL )
-          { $YZero = $this->scaleComputeY($Floating0Value,array("AxisID"=>$Serie["Axis"])); }
-         else
+          { $YZero = $this->scaleComputeY($Floating0Value,array("AxisID"=>$Serie["Axis"])); } else
           { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
 
          if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
@@ -4527,8 +4493,7 @@ 
              if ( $Floating0Serie != NULL )
               {
                if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
-                { $Value = $Data["Series"][$Floating0Serie]["Data"][$Key]; }
-               else
+                { $Value = $Data["Series"][$Floating0Serie]["Data"][$Key]; } else
                 { $Value = 0; }
 
                $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
@@ -4549,14 +4514,13 @@ 
                 {
                  $this->drawLine($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y1,$Color);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1-1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y1+1),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
+                } else
                 {
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-                 if ( $Rounded )
-                  $this->drawRoundedFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$RoundRadius,$Color);
-                 else
+                 if ( $Rounded ) {
+                                   $this->drawRoundedFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$RoundRadius,$Color);
+                 } else
                   {
                    $this->drawFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$Color);
 
@@ -4568,14 +4532,14 @@ 
 
                      if ( $GradientMode == GRADIENT_SIMPLE )
                       {
-                       if ( $Serie["Data"][$Key] >= 0 )
-                        $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       else
-                        $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                       if ( $Serie["Data"][$Key] >= 0 ) {
+                                               $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                       } else {
+                                               $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                       }
 
                        $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_VERTICAL,$GradienColor);
-                      }
-                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                      } elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
                       {
                        $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
                        $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
@@ -4614,8 +4578,7 @@ 
                    $CenterY = ($Y2-$Y1)/2 + $Y1;
 
                    $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"Angle"=>90));
-                  }
-                 else
+                  } else
                   {
                    if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
                    $this->drawText($X+$XOffset+$XSize/2,$Y2-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
@@ -4628,8 +4591,7 @@ 
              $X = $X + $XStep;
              $ID++;
             }
-          }
-         else
+          } else
           {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
@@ -4655,9 +4617,9 @@ 
             {
              if ( $Floating0Serie != NULL )
               {
-               if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
-                $Value = $Data["Series"][$Floating0Serie]["Data"][$Key];
-               else { $Value = 0; }
+               if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) ) {
+                               $Value = $Data["Series"][$Floating0Serie]["Data"][$Key];
+               } else { $Value = 0; }
 
                $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
                if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
@@ -4676,14 +4638,13 @@ 
                 {
                  $this->drawLine($X1,$Y+$YOffset+$YSpace,$X1,$Y+$YOffset+$YSize-$YSpace,$Color);
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1-1).",".floor($Y+$YOffset+$YSpace).",".floor($X1+1).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
-                }
-               else
+                } else
                 {
                  if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1).",".floor($Y+$YOffset+$YSpace).",".floor($X2).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-                 if ( $Rounded )
-                  $this->drawRoundedFilledRectangle($X1+1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$RoundRadius,$Color);
-                 else
+                 if ( $Rounded ) {
+                                   $this->drawRoundedFilledRectangle($X1+1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$RoundRadius,$Color);
+                 } else
                   {
                    $this->drawFilledRectangle($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$Color);
 
@@ -4695,14 +4656,14 @@ 
 
                      if ( $GradientMode == GRADIENT_SIMPLE )
                       {
-                       if ( $Serie["Data"][$Key] >= 0 )
-                        $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
-                       else
-                        $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                       if ( $Serie["Data"][$Key] >= 0 ) {
+                                               $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                       } else {
+                                               $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                       }
 
                        $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_HORIZONTAL,$GradienColor);
-                      }
-                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                      } elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
                       {
                        $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
                        $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
@@ -4741,8 +4702,7 @@ 
                    $CenterY = (($Y+$YOffset+$YSize-$YSpace)-($Y+$YOffset+$YSpace))/2 + ($Y+$YOffset+$YSpace);
 
                    $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize));
-                  }
-                 else
+                  } else
                   {
                    if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
                    $this->drawText($X2+$Offset,$Y+$YOffset+$YSize/2,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
@@ -4856,9 +4816,9 @@ 
 
                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset).",".floor($Y1-$YSpaceUp+$YSpaceDown).",".floor($X+$XOffset+$XSize).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-               if ( $Rounded )
-                $this->drawRoundedFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$RoundRadius,$Color);
-               else
+               if ( $Rounded ) {
+                               $this->drawRoundedFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$RoundRadius,$Color);
+               } else
                 {
                  $this->drawFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$Color);
 
@@ -4872,8 +4832,7 @@ 
                     {
                      $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                      $this->drawGradientArea($X+$XOffset,$Y1-1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+1,DIRECTION_VERTICAL,$GradientColor);
-                    }
-                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                    } elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
                     {
                      $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
                      $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
@@ -4911,8 +4870,9 @@ 
 
                  if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
                   {
-                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
-                    $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  ) {
+                                       $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                   }
                   }
                 }
 
@@ -4921,8 +4881,7 @@ 
 
              $X = $X + $XStep;
             }
-          }
-         else
+          } else
           {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
@@ -4951,9 +4910,9 @@ 
 
                if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1+$XSpaceLeft).",".floor($Y+$YOffset).",".floor($X2-$XSpaceRight).",".floor($Y+$YOffset+$YSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
 
-               if ( $Rounded )
-                $this->drawRoundedFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$RoundRadius,$Color);
-               else
+               if ( $Rounded ) {
+                               $this->drawRoundedFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$RoundRadius,$Color);
+               } else
                 {
                  $this->drawFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$Color);
 
@@ -4967,8 +4926,7 @@ 
                     {
                      $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
                      $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_HORIZONTAL,$GradientColor);
-                    }
-                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                    } elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
                     {
                      $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
                      $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
@@ -5005,8 +4963,9 @@ 
 
                  if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
                   {
-                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
-                    $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  ) {
+                                       $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                   }
                   }
                 }
 
@@ -5064,8 +5023,7 @@ 
            if ( !isset($OverallOffset[$Key]) || !isset($OverallOffset[$Key][$Sign]) ) { $OverallOffset[$Key][$Sign] = 0; }
 
            if ( $Sign == "+" )
-            { $Data["Series"][$SerieName]["Data"][$Key] = $Value + $OverallOffset[$Key][$Sign]; }
-           else
+            { $Data["Series"][$SerieName]["Data"][$Key] = $Value + $OverallOffset[$Key][$Sign]; } else
             { $Data["Series"][$SerieName]["Data"][$Key] = $Value - $OverallOffset[$Key][$Sign]; }
 
            $OverallOffset[$Key][$Sign] = $OverallOffset[$Key][$Sign] + abs($Value);
@@ -5085,17 +5043,19 @@ 
 
          $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
 
-         if ( $LineSurrounding != NULL )
-          $LineColor = array("R"=>$R+$LineSurrounding,"G"=>$G+$LineSurrounding,"B"=>$B+$LineSurrounding,"Alpha"=>$Alpha);
-         elseif ( $LineR != VOID )
-          $LineColor = array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
-         else
-          $LineColor = $Color;
+         if ( $LineSurrounding != NULL ) {
+                   $LineColor = array("R"=>$R+$LineSurrounding,"G"=>$G+$LineSurrounding,"B"=>$B+$LineSurrounding,"Alpha"=>$Alpha);
+         } elseif ( $LineR != VOID ) {
+                   $LineColor = array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
+         } else {
+                   $LineColor = $Color;
+         }
 
-         if ( $PlotBorderSurrounding != NULL )
-          $PlotBorderColor = array("R"=>$R+$PlotBorderSurrounding,"G"=>$G+$PlotBorderSurrounding,"B"=>$B+$PlotBorderSurrounding,"Alpha"=>$PlotBorderAlpha);
-         else
-          $PlotBorderColor = array("R"=>$PlotBorderR,"G"=>$PlotBorderG,"B"=>$PlotBorderB,"Alpha"=>$PlotBorderAlpha);
+         if ( $PlotBorderSurrounding != NULL ) {
+                   $PlotBorderColor = array("R"=>$R+$PlotBorderSurrounding,"G"=>$G+$PlotBorderSurrounding,"B"=>$B+$PlotBorderSurrounding,"Alpha"=>$PlotBorderAlpha);
+         } else {
+                   $PlotBorderColor = array("R"=>$PlotBorderR,"G"=>$PlotBorderG,"B"=>$PlotBorderB,"Alpha"=>$PlotBorderAlpha);
+         }
 
          $AxisID	= $Serie["Axis"];
          $Mode		= $Data["Axis"][$AxisID]["Display"];
@@ -5140,8 +5100,7 @@ 
               }
             }
            $this->Shadow = FALSE;
-          }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+          } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
           {
            if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
            if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
@@ -5203,8 +5162,7 @@ 
          $Result[$Key]["BorderR"] = $Result[$Key]["R"] + $Surrounding;
          $Result[$Key]["BorderG"] = $Result[$Key]["G"] + $Surrounding;
          $Result[$Key]["BorderB"] = $Result[$Key]["B"] + $Surrounding;
-        }
-       else
+        } else
         {
          if ( isset($Values["BorderR"]) )     { $Result[$Key]["BorderR"] = $Values["BorderR"]; } else { $Result[$Key]["BorderR"] = $Result[$Key]["R"]; }
          if ( isset($Values["BorderG"]) )     { $Result[$Key]["BorderG"] = $Values["BorderG"]; } else { $Result[$Key]["BorderG"] = $Result[$Key]["G"]; }
@@ -5263,10 +5221,11 @@ 
 
      list($XMargin,$XDivs) = $this->scaleGetXSettings();
 
-     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-      $YPos = $this->DataSet->Data["GraphArea"]["Y2"] + $Offset;
-     else
-      $XPos = $this->DataSet->Data["GraphArea"]["X2"] + $Offset;
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
+           $YPos = $this->DataSet->Data["GraphArea"]["Y2"] + $Offset;
+     } else {
+           $XPos = $this->DataSet->Data["GraphArea"]["X2"] + $Offset;
+     }
 
      foreach($Data["Series"] as $SerieName => $Serie)
       {
@@ -5289,9 +5248,9 @@ 
                $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
                if ( $CaptionBox ) { $this->drawFilledRectangle($StartX,$YPos,$EndX,$YPos+$CaptionHeight,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
                $this->drawLine($StartX+2,$YPos+($CaptionHeight/2),$EndX-2,$YPos+($CaptionHeight/2),$CaptionSettings);
-              }
-             else
-              $this->drawFilledRectangle($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin,$YPos,$this->GraphAreaX1-$CaptionMargin+$XMargin,$YPos+$CaptionHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+              } else {
+                           $this->drawFilledRectangle($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin,$YPos,$this->GraphAreaX1-$CaptionMargin+$XMargin,$YPos+$CaptionHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+             }
             }
 
            if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
@@ -5319,8 +5278,7 @@ 
               { $Slope = ($LastY - $Y); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
 
              if ( $Y == VOID )
-              { $LastX = NULL; $LastY = NULL; }
-             else
+              { $LastX = NULL; $LastY = NULL; } else
               { $LastX = $X; $LastY = $Y; }
             }
 
@@ -5337,8 +5295,7 @@ 
                  $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
                  $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
                  $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
-                }
-               elseif ( $Slope < 0 )
+                } elseif ( $Slope < 0 )
                 {
                  $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
                  $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
@@ -5348,28 +5305,29 @@ 
 
                $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
 
-               if ( $ShadedSlopeBox && $LastColor != NULL ) // && $Slope != 0
+               if ( $ShadedSlopeBox && $LastColor != NULL ) {
+                   // && $Slope != 0
                 {
                  $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+               }
                  $this->drawGradientArea($LastX,$TopY,$X,$BottomY,DIRECTION_HORIZONTAL,$GradientSettings);
-                }
-               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) // || $Slope == 0
+                } elseif ( !$ShadedSlopeBox || $LastColor == NULL ) {
+                   // || $Slope == 0
                 $this->drawFilledRectangle(floor($LastX),$TopY,floor($X),$BottomY,$Color);
+               }
 
                $LastColor = $Color;
               }
 
              if ( $Y == VOID )
-              { $LastY = NULL; }
-             else
+              { $LastY = NULL; } else
               { $LastX = $X; $LastY = $Y; }
 
              $X = $X + $XStep;
             }
 
            $YPos = $YPos + $CaptionHeight + $SerieSpacing;
-          }
-         else
+          } else
           {
            if ( $Caption )
             {
@@ -5380,9 +5338,9 @@ 
                $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
                if ( $CaptionBox ) { $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
                $this->drawLine($XPos+($CaptionHeight/2),$StartY+2,$XPos+($CaptionHeight/2),$EndY-2,$CaptionSettings);
-              }
-             else
-              $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+              } else {
+                           $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+             }
             }
 
 
@@ -5411,8 +5369,7 @@ 
               { $Slope = ($X - $LastX); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
 
              if ( $X == VOID )
-              { $LastX = NULL; }
-             else
+              { $LastX = NULL; } else
               { $LastX = $X; }
             }
 
@@ -5429,8 +5386,7 @@ 
                  $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
                  $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
                  $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
-                }
-               elseif ( $Slope < 0 )
+                } elseif ( $Slope < 0 )
                 {
                  $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
                  $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
@@ -5445,16 +5401,15 @@ 
                  $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
 
                  $this->drawGradientArea($TopX,$LastY,$BottomX,$Y,DIRECTION_VERTICAL,$GradientSettings);
-                }
-               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) 
-                $this->drawFilledRectangle($TopX,floor($LastY),$BottomX,floor($Y),$Color);
+                } elseif ( !$ShadedSlopeBox || $LastColor == NULL ) {
+                               $this->drawFilledRectangle($TopX,floor($LastY),$BottomX,floor($Y),$Color);
+               }
 
                $LastColor = $Color;
               }
 
              if ( $X == VOID )
-              { $LastX = NULL; }
-             else
+              { $LastX = NULL; } else
               { $LastX = $X; $LastY = $Y; }
 
              $Y = $Y + $XStep;
@@ -5527,8 +5482,7 @@ 
            if ( $Y2 > $this->GraphAreaY2 ) { $X2 = $X2 - ($Y2-$this->GraphAreaY2); $Y2 = $this->GraphAreaY2; }
 
            $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
-          }
-         else
+          } else
           {
            if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
            $Y = $this->GraphAreaY1 + $XMargin;
@@ -5605,17 +5559,18 @@ 
             {
              $AxisID      = $Data["Series"][$SerieName]["Axis"];
 
-             if ( $OverrideTitle != NULL)
-              $Description = $OverrideTitle;
-             elseif ( count($SeriesName) == 1 )
+             if ( $OverrideTitle != NULL) {
+                           $Description = $OverrideTitle;
+             } elseif ( count($SeriesName) == 1 )
               {
-               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
-                $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-               else
-                $Description = $Data["Series"][$SerieName]["Description"];
-              }
-             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
-              $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) ) {
+                               $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+               } else {
+                               $Description = $Data["Series"][$SerieName]["Description"];
+               }
+              } elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) ) {
+                           $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+             }
 
              $AxisMode     = $Data["Axis"][$AxisID]["Display"];
              $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
@@ -5627,18 +5582,20 @@ 
              $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
              $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
 
-             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
-              $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
-             else
-              $SerieOffset = 0;
+             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) ) {
+                           $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
+             } else {
+                           $SerieOffset = 0;
+             }
 
              $Value = $Data["Series"][$SerieName]["Data"][$Index];
              if ( $Value == VOID ) { $Value = "NaN"; }
 
-             if ( $ForceLabels != NULL )
-              $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
-             else
-              $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+             if ( $ForceLabels != NULL ) {
+                           $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
+             } else {
+                           $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+             }
 
              if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
               {
@@ -5664,18 +5621,18 @@ 
 
              if ($Y < $MinY) { $MinY = $Y; }
 
-             if ( $DrawPoint == LABEL_POINT_CIRCLE )
-              $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-             elseif ( $DrawPoint == LABEL_POINT_BOX )
-              $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+             if ( $DrawPoint == LABEL_POINT_CIRCLE ) {
+                           $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+             } elseif ( $DrawPoint == LABEL_POINT_BOX ) {
+                           $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+             }
 
              $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
             }
           }
          $this->drawLabelBox($X,$MinY-3,$Description,$Series,$Format);
 
-        }
-       else
+        } else
         {
          if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
          $Y = $this->GraphAreaY1 + $XMargin + $Index * $XStep;
@@ -5689,17 +5646,18 @@ 
             {
              $AxisID      = $Data["Series"][$SerieName]["Axis"];
 
-             if ( $OverrideTitle != NULL)
-              $Description = $OverrideTitle;
-             elseif ( count($SeriesName) == 1 )
+             if ( $OverrideTitle != NULL) {
+                           $Description = $OverrideTitle;
+             } elseif ( count($SeriesName) == 1 )
               {
-               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
-                $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
-               else
-                $Description = $Data["Series"][$SerieName]["Description"];
-              }
-             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
-              $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) ) {
+                               $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+               } else {
+                               $Description = $Data["Series"][$SerieName]["Description"];
+               }
+              } elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) ) {
+                           $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+             }
 
              $AxisMode     = $Data["Axis"][$AxisID]["Display"];
              $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
@@ -5712,8 +5670,7 @@ 
                $Serie["G"] = $Data["Extended"]["Palette"][$Index]["G"];
                $Serie["B"] = $Data["Extended"]["Palette"][$Index]["B"];
                $Serie["Alpha"] = $Data["Extended"]["Palette"][$Index]["Alpha"];
-              }
-             else
+              } else
               {
                $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
                $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
@@ -5721,16 +5678,18 @@ 
                $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
               }
 
-             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
-              $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
-             else
-              $SerieOffset = 0;
+             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) ) {
+                           $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
+             } else {
+                           $SerieOffset = 0;
+             }
 
              $Value = $Data["Series"][$SerieName]["Data"][$Index];
-             if ( $ForceLabels != NULL )
-              $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
-             else
-              $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+             if ( $ForceLabels != NULL ) {
+                           $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
+             } else {
+                           $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+             }
              if ( $Value == VOID ) { $Value = "NaN"; }
 
              if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
@@ -5757,10 +5716,11 @@ 
 
              if ($X < $MinX) { $MinX = $X; }
 
-             if ( $DrawPoint == LABEL_POINT_CIRCLE )
-              $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-             elseif ( $DrawPoint == LABEL_POINT_BOX )
-              $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+             if ( $DrawPoint == LABEL_POINT_CIRCLE ) {
+                           $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+             } elseif ( $DrawPoint == LABEL_POINT_BOX ) {
+                           $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+             }
 
              $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
             }
@@ -5844,8 +5804,7 @@ 
         {
          $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
          $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
-        }
-       else
+        } else
         {
          $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
          $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
@@ -5858,10 +5817,11 @@ 
 
      /* Draw the background */
      $GradientSettings = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB);
-     if ( $NoTitle )
-      $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
-     else
-      $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
+     if ( $NoTitle ) {
+           $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
+     } else {
+           $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
+     }
      $Poly = ""; $Poly[] = $X; $Poly[] = $Y; $Poly[] = $X-5; $Poly[] = $Y-5; $Poly[] = $X+5; $Poly[] = $Y-5;
      $this->drawPolygon($Poly,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB,"NoBorder"=>TRUE));
 
@@ -5876,8 +5836,7 @@ 
        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin,$Y-5,$OuterBorderColor);
        imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5,$OuterBorderColor);
        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$OuterBorderColor);
-      }
-     else
+      } else
       {
        imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin,$Y-5,$OuterBorderColor);
        imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5,$OuterBorderColor);
@@ -5895,8 +5854,7 @@ 
        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin+1,$Y-6,$InnerBorderColor);
        imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-6,$InnerBorderColor);
        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$InnerBorderColor);
-      }
-     else
+      } else
       {
        imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin+1,$Y-6,$InnerBorderColor);
        imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-6,$InnerBorderColor);
@@ -5910,16 +5868,16 @@ 
        $XMargin = $VerticalMargin / 2;
        $this->drawLine($XMin+$XMargin,$YPos+1,$XMax-$XMargin,$YPos+1,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB));
        $this->drawLine($XMin+$XMargin,$YPos,$XMax-$XMargin,$YPos,array("R"=>$GradientStartR,"G"=>$GradientStartG,"B"=>$GradientStartB));
-      }
-     elseif ( $TitleMode == LABEL_TITLE_BACKGROUND )
+      } elseif ( $TitleMode == LABEL_TITLE_BACKGROUND )
       {
        $this->drawFilledRectangle($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2,array("R"=>$TitleBackgroundR,"G"=>$TitleBackgroundG,"B"=>$TitleBackgroundB));
        imageline($this->Picture,$XMin+1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$XMax-1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$InnerBorderColor);
       }
 
      /* Write the description */
-     if ( !$NoTitle )
-      $this->drawText($XMin+$VerticalMargin,$Y-7-$CaptionHeight-$HorizontalMargin*2,$Title,array("Align"=>TEXT_ALIGN_BOTTOMLEFT,"R"=>$TitleR,"G"=>$TitleG,"B"=>$TitleB));
+     if ( !$NoTitle ) {
+           $this->drawText($XMin+$VerticalMargin,$Y-7-$CaptionHeight-$HorizontalMargin*2,$Title,array("Align"=>TEXT_ALIGN_BOTTOMLEFT,"R"=>$TitleR,"G"=>$TitleG,"B"=>$TitleB));
+     }
 
      /* Write the value */
      $YPos = $Y-5-$HorizontalMargin; $XPos = $XMin+$VerticalMargin+$SerieBoxSize+$SerieBoxSpacing;
@@ -5951,13 +5909,11 @@ 
       {
        if ( $PlotBorder ) { $this->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
        $this->drawFilledCircle($X,$Y,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_FILLEDSQUARE )
+      } elseif ( $Shape == SERIE_SHAPE_FILLEDSQUARE )
       {
        if ( $PlotBorder ) { $this->drawFilledRectangle($X-$PlotSize-$BorderSize,$Y-$PlotSize-$BorderSize,$X+$PlotSize+$BorderSize,$Y+$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
        $this->drawFilledRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_FILLEDTRIANGLE )
+      } elseif ( $Shape == SERIE_SHAPE_FILLEDTRIANGLE )
       {
        if ( $PlotBorder )
         {
@@ -5967,23 +5923,20 @@ 
 
        $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X-$PlotSize; $Pos[]=$Y+$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y+$PlotSize;
        $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_TRIANGLE )
+      } elseif ( $Shape == SERIE_SHAPE_TRIANGLE )
       {
        $this->drawLine($X,$Y-$PlotSize,$X-$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
        $this->drawLine($X-$PlotSize,$Y+$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
        $this->drawLine($X+$PlotSize,$Y+$PlotSize,$X,$Y-$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-      }
-     elseif ( $Shape == SERIE_SHAPE_SQUARE )
-      $this->drawRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-     elseif ( $Shape == SERIE_SHAPE_CIRCLE )
-      $this->drawCircle($X,$Y,$PlotSize,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
-     elseif ( $Shape == SERIE_SHAPE_DIAMOND )
+      } elseif ( $Shape == SERIE_SHAPE_SQUARE ) {
+           $this->drawRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+     } elseif ( $Shape == SERIE_SHAPE_CIRCLE ) {
+           $this->drawCircle($X,$Y,$PlotSize,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+     } elseif ( $Shape == SERIE_SHAPE_DIAMOND )
       {
        $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
        $this->drawPolygon($Pos,array("NoFill"=>TRUE,"BorderR"=>$R,"BorderG"=>$G,"BorderB"=>$B,"BorderAlpha"=>$Alpha));
-      }      
-     elseif ( $Shape == SERIE_SHAPE_FILLEDDIAMOND )
+      } elseif ( $Shape == SERIE_SHAPE_FILLEDDIAMOND )
       {
        if ( $PlotBorder )
         {
@@ -6035,8 +5988,7 @@ 
          if ( $inHorizon ) { $inHorizon = FALSE; $Result[] = array("X1"=>$LastX,"Y1"=>$Pos["Y1"],"X2"=>$Pos["X1"],"Y2"=>$Pos["Y1"]); }
 
          $Result[] = array("X1"=>$Pos["X1"],"Y1"=>$Pos["Y1"],"X2"=>$Pos["X2"],"Y2"=>$Pos["Y2"]);
-        }
-       else { if ( !$inHorizon ) { $inHorizon = TRUE; $LastX = $Pos["X1"];} }
+        } else { if ( !$inHorizon ) { $inHorizon = TRUE; $LastX = $Pos["X1"];} }
       }
      $Segments = $Result;
 
@@ -6078,30 +6030,24 @@ 
            if ( min($Y1,$Y2) <= $Y && max($Y1,$Y2) >= $Y )
             {
              if ( $Y1 == $Y2 )
-              { $X = $X1; }
-             else
+              { $X = $X1; } else
               { $X = $X1 + ( ($Y-$Y1)*$X2 - ($Y-$Y1)*$X1 ) / ($Y2-$Y1); }
 
              $X = floor($X);
 
              if ( $X2 == $X1 )
-              { $Slope = "!"; }
-             else
+              { $Slope = "!"; } else
               {
                $SlopeC = ($Y2 - $Y1) / ($X2 - $X1);
                if( $SlopeC == 0 )
-                { $Slope = "="; }
-               elseif( $SlopeC > 0 )
-                { $Slope = "+"; }
-               elseif ( $SlopeC < 0 )
+                { $Slope = "="; } elseif( $SlopeC > 0 )
+                { $Slope = "+"; } elseif ( $SlopeC < 0 )
                 { $Slope = "-"; }
               }
 
              if ( !is_array($Intersections) )
-              { $Intersections[] = $X; }
-             elseif( !in_array($X,$Intersections) )
-              { $Intersections[] = $X; }
-             elseif( in_array($X,$Intersections) )
+              { $Intersections[] = $X; } elseif( !in_array($X,$Intersections) )
+              { $Intersections[] = $X; } elseif( in_array($X,$Intersections) )
               {
                if ($Y == $DebugLine) { echo $Slope."/".$LastSlope."(".$X.") "; }
 
@@ -6138,9 +6084,9 @@ 
              $LastX = OUT_OF_SIGHT;
              foreach($Intersections as $Key => $X)
               {
-               if ( $LastX == OUT_OF_SIGHT )
-                $LastX = $X;
-               elseif ( $LastX != OUT_OF_SIGHT )
+               if ( $LastX == OUT_OF_SIGHT ) {
+                               $LastX = $X;
+               } elseif ( $LastX != OUT_OF_SIGHT )
                 {
                  if ( $this->getFirstDecimal($LastX) > 1 ) { $LastX++; }
 
@@ -6175,8 +6121,9 @@ 
      /* Draw the polygon border, if required */
      if ( !$NoBorder)
       {
-       foreach($Segments as $Key => $Coords)
-        $this->drawLine($Coords["X1"],$Coords["Y1"],$Coords["X2"],$Coords["Y2"],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Threshold"=>$Threshold));
+       foreach($Segments as $Key => $Coords) {
+               $this->drawLine($Coords["X1"],$Coords["Y1"],$Coords["X2"],$Coords["Y2"],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Threshold"=>$Threshold));
+       }
       }
 
      $this->Shadow = $RestoreShadow;

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

Braces +64 added lines, -57 removed lines

@@ -84,16 +84,17 @@ 
    /* Add a single point or an array to the given serie */
    function addPoints($Values,$SerieName="Serie1")
     {
-     if (!isset($this->Data["Series"][$SerieName]))
-      $this->initialise($SerieName);
+     if (!isset($this->Data["Series"][$SerieName])) {
+           $this->initialise($SerieName);
+     }
 
      if ( is_array($Values) )
       {
        foreach($Values as $Key => $Value)
         { $this->Data["Series"][$SerieName]["Data"][] = $Value; }
-      }
-     else
-      $this->Data["Series"][$SerieName]["Data"][] = $Values;
+      } else {
+           $this->Data["Series"][$SerieName]["Data"][] = $Values;
+     }
 
      if ( $Values != VOID )
       {
@@ -273,9 +274,9 @@ 
       {
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        return(array_sum($SerieData)/sizeof($SerieData));
-      }
-     else
-      return(NULL);
+      } else {
+           return(NULL);
+     }
     }
 
    /* Return the geometric mean of the given serie */
@@ -286,9 +287,9 @@ 
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        $Seriesum  = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
        return(pow($Seriesum,1/sizeof($SerieData)));
-      }
-     else
-      return(NULL);
+      } else {
+           return(NULL);
+     }
     }
 
    /* Return the harmonic mean of the given serie */
@@ -299,9 +300,9 @@ 
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        $Seriesum  = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
        return(sizeof($SerieData)/$Seriesum);
-      }
-     else
-      return(NULL);
+      } else {
+           return(NULL);
+     }
     }
 
    /* Return the standard deviation of the given serie */
@@ -313,15 +314,16 @@ 
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
 
        $DeviationSum = 0;
-       foreach($SerieData as $Key => $Value)
-        $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
+       foreach($SerieData as $Key => $Value) {
+               $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
+       }
 
        $Deviation = sqrt($DeviationSum/count($SerieData));
 
        return($Deviation);
-      }
-     else
-      return(NULL);
+      } else {
+           return(NULL);
+     }
     }
 
    /* Return the Coefficient of variation of the given serie */
@@ -332,13 +334,14 @@ 
        $Average           = $this->getSerieAverage($Serie);
        $StandardDeviation = $this->getStandardDeviation($Serie);
 
-       if ( $StandardDeviation != 0 )
-        return($StandardDeviation/$Average);
-       else
-        return(NULL);
-      }
-     else
-      return(NULL);
+       if ( $StandardDeviation != 0 ) {
+               return($StandardDeviation/$Average);
+       } else {
+               return(NULL);
+       }
+      } else {
+           return(NULL);
+     }
     }
 
    /* Return the median value of the given serie */
@@ -350,13 +353,14 @@ 
        sort($SerieData);
        $SerieCenter = floor(sizeof($SerieData)/2);
 
-       if ( isset($SerieData[$SerieCenter]) )
-        return($SerieData[$SerieCenter]);
-       else
-        return(NULL);
-      }
-     else
-      return(NULL);
+       if ( isset($SerieData[$SerieCenter]) ) {
+               return($SerieData[$SerieCenter]);
+       } else {
+               return(NULL);
+       }
+      } else {
+           return(NULL);
+     }
     }
 
    /* Return the x th percentil of the given serie */
@@ -371,10 +375,11 @@ 
      $SortedValues = $this->Data["Series"][$Serie]["Data"];
      sort($SortedValues);
 
-     if ( is_numeric($SortedValues[$PercentilID]) )
-      return($SortedValues[$PercentilID]);
-     else
-      return(NULL);
+     if ( is_numeric($SortedValues[$PercentilID]) ) {
+           return($SortedValues[$PercentilID]);
+     } else {
+           return(NULL);
+     }
     }
 
    /* Add random values to a given serie */
@@ -549,10 +554,11 @@ 
       {
        foreach($this->Data["Series"] as $Key => $Value)
         {
-         if ( !isset($this->Palette[$ID]) )
-          $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
-         else
-          $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
+         if ( !isset($this->Palette[$ID]) ) {
+                   $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
+         } else {
+                   $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
+         }
          $ID++;
         }
       }
@@ -569,9 +575,9 @@ 
      $this->Data["ScatterSeries"][$ID]["Ticks"]		= 0;
      $this->Data["ScatterSeries"][$ID]["Weight"]	= 0;
 
-     if ( isset($this->Palette[$ID]) )
-      $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
-     else
+     if ( isset($this->Palette[$ID]) ) {
+           $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
+     } else
       {
        $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
        $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
@@ -595,9 +601,9 @@ 
      $this->Data["Series"][$Serie]["Weight"]		= 0;
      $this->Data["Series"][$Serie]["Shape"]		= SERIE_SHAPE_FILLEDCIRCLE;
 
-     if ( isset($this->Palette[$ID]) )
-      $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
-     else
+     if ( isset($this->Palette[$ID]) ) {
+           $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
+     } else
       {
        $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
        $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
@@ -633,8 +639,9 @@ 
        foreach ($SelectedSeries as $Key => $SerieName )
         {
          $Value = $this->Data["Series"][$SerieName]["Data"][$i];
-         if ( $Value != VOID )
-          $Factor = $Factor + abs($Value);
+         if ( $Value != VOID ) {
+                   $Factor = $Factor + abs($Value);
+         }
         }
 
        if ( $Factor != 0 )
@@ -645,12 +652,13 @@ 
           {
            $Value = $this->Data["Series"][$SerieName]["Data"][$i];
 
-           if ( $Value != VOID && $Factor != $NormalizationFactor )
-            $this->Data["Series"][$SerieName]["Data"][$i] = round(abs($Value)*$Factor,$Round);
-           elseif ( $Value == VOID || $Value == 0 )
-            $this->Data["Series"][$SerieName]["Data"][$i] = VOID;
-           elseif ( $Factor == $NormalizationFactor )
-            $this->Data["Series"][$SerieName]["Data"][$i] = $NormalizationFactor;
+           if ( $Value != VOID && $Factor != $NormalizationFactor ) {
+                       $this->Data["Series"][$SerieName]["Data"][$i] = round(abs($Value)*$Factor,$Round);
+           } elseif ( $Value == VOID || $Value == 0 ) {
+                       $this->Data["Series"][$SerieName]["Data"][$i] = VOID;
+           } elseif ( $Factor == $NormalizationFactor ) {
+                       $this->Data["Series"][$SerieName]["Data"][$i] = $NormalizationFactor;
+           }
           }
         }
       }
@@ -687,8 +695,7 @@ 
             {
              foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
              $HeaderParsed = TRUE;
-            }
-           else
+            } else
             {
              if ($SerieNames == "" ) { foreach($Values as $Key => $Name) {  if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
              foreach($Values as $Key => $Value) {  if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }

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

Braces +40 added lines, -46 removed lines

@@ -52,19 +52,16 @@ 
            $BubbleBounds = $Value + $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
            if ( !isset($NewPositiveSerie[$Key]) )
-            { $NewPositiveSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
+            { $NewPositiveSerie[$Key] = $BubbleBounds; } elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
             { $NewPositiveSerie[$Key] = $BubbleBounds; }
 
            $LastPositive = $BubbleBounds;
-          }
-         else
+          } else
           {
            $BubbleBounds = $Value - $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
            if ( !isset($NewNegativeSerie[$Key]) )
-            { $NewNegativeSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
+            { $NewNegativeSerie[$Key] = $BubbleBounds; } elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
             { $NewNegativeSerie[$Key] = $BubbleBounds; }
 
            $LastNegative = $BubbleBounds;
@@ -158,19 +155,16 @@ 
          if ( $BorderWidth != 1 )
           {
            if ( $Surrounding != NULL )
-            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; } else
             { $BorderR = $BorderR; $BorderG = $BorderG; $BorderB = $BorderB; }
            if ( $ForceAlpha != VOID ) { $BorderAlpha = $ForceAlpha/2; }
            $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
-          }
-         else
+          } else
           {
            $Color["BorderAlpha"] = $BorderAlpha;
 
            if ( $Surrounding != NULL )
-            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; } else
             { $Color["BorderR"] = $BorderR; $Color["BorderG"] = $BorderG; $Color["BorderB"] = $BorderB; }
            if ( $ForceAlpha != VOID ) { $Color["BorderAlpha"] = $ForceAlpha/2; }
           }
@@ -196,11 +190,10 @@ 
               {
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
-              $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-            }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
+              } else {
+                           $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+             }
+            } elseif ( $Shape == BUBBLE_SHAPE_ROUND )
             {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
@@ -208,14 +201,13 @@ 
               {
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
-              $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+              } else {
+                           $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+             }
             }
 
            $X = $X + $XStep;
-          }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+          } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
           {
            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
            $X = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
@@ -228,11 +220,10 @@ 
               {
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
-              $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-            }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
+              } else {
+                           $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+             }
+            } elseif ( $Shape == BUBBLE_SHAPE_ROUND )
             {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
@@ -240,9 +231,9 @@ 
               {
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
-              $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+              } else {
+                           $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+             }
             }
 
            $Y = $Y + $XStep;
@@ -261,8 +252,9 @@ 
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
-     if ( !isset($Data["Series"][$SerieName]) || !isset($Data["Series"][$SerieWeightName]) )
-      return(0);
+     if ( !isset($Data["Series"][$SerieName]) || !isset($Data["Series"][$SerieWeightName]) ) {
+           return(0);
+     }
 
      list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
 
@@ -282,19 +274,21 @@ 
        $Value    = $Data["Series"][$SerieName]["Data"][$Point];
        $PosArray = $this->pChartObject->scaleComputeY($Value,array("AxisID"=>$AxisID));
 
-       if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Point]) )
-        $Abscissa = $Data["Series"][$Data["Abscissa"]]["Data"][$Point]." : ";
-       else
-        $Abscissa = "";
+       if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Point]) ) {
+               $Abscissa = $Data["Series"][$Data["Abscissa"]]["Data"][$Point]." : ";
+       } else {
+               $Abscissa = "";
+       }
 
        $Value   = $this->pChartObject->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
        $Weight  = $Data["Series"][$SerieWeightName]["Data"][$Point];
        $Caption = $Abscissa.$Value." / ".$Weight;
 
-       if ( isset($Data["Series"][$SerieName]["Description"]) )
-        $Description = $Data["Series"][$SerieName]["Description"];
-       else
-        $Description = "No description";
+       if ( isset($Data["Series"][$SerieName]["Description"]) ) {
+               $Description = $Data["Series"][$SerieName]["Description"];
+       } else {
+               $Description = "No description";
+       }
 
        $Series = "";
        $Series[] = array("Format"=>$Color,"Caption"=>$Caption);
@@ -305,8 +299,7 @@ 
 
          $X = floor($X + $Point * $XStep);
          $Y = floor($PosArray);
-        }
-       else
+        } else
         {
          if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
 
@@ -314,10 +307,11 @@ 
          $Y = floor($Y + $Point * $YStep);
         }
 
-       if ( $DrawPoint == LABEL_POINT_CIRCLE )
-        $this->pChartObject->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-       elseif ( $DrawPoint == LABEL_POINT_BOX )
-        $this->pChartObject->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+       if ( $DrawPoint == LABEL_POINT_CIRCLE ) {
+               $this->pChartObject->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+       } elseif ( $DrawPoint == LABEL_POINT_BOX ) {
+               $this->pChartObject->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+       }
 
        $this->pChartObject->drawLabelBox($X,$Y-3,$Description,$Series,$Format);
       }

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

Braces +1 added lines, -2 removed lines

@@ -135,8 +135,7 @@
         {
          $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
          $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
-        }
-       else
+        } else
         {
          $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
          $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);

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

Braces +75 added lines, -89 removed lines

@@ -96,8 +96,7 @@ 
      foreach($Data["Axis"] as $AxisID => $AxisSettings)
       {
        if ( $AxisSettings["Identity"] == AXIS_X)
-        { $Width = $this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2; }
-       else
+        { $Width = $this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2; } else
         { $Width = $this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1 - $YMargin*2; }
 
        $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
@@ -114,22 +113,20 @@ 
          $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
 
          $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
-        }
-       elseif ( $Mode == SCALE_MODE_MANUAL )
+        } elseif ( $Mode == SCALE_MODE_MANUAL )
         {
          if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
           {
            $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
            $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
-          }
-         else
+          } else
           { echo "Manual scale boundaries not set."; exit(); }
         }
 
        /* Full manual scale */
-       if ( isset($ManualScale[$AxisID]["Rows"]) && isset($ManualScale[$AxisID]["RowHeight"]) )
-        $Scale = array("Rows"=>$ManualScale[$AxisID]["Rows"],"RowHeight"=>$ManualScale[$AxisID]["RowHeight"],"XMin"=>$ManualScale[$AxisID]["Min"],"XMax"=>$ManualScale[$AxisID]["Max"]);
-       else
+       if ( isset($ManualScale[$AxisID]["Rows"]) && isset($ManualScale[$AxisID]["RowHeight"]) ) {
+               $Scale = array("Rows"=>$ManualScale[$AxisID]["Rows"],"RowHeight"=>$ManualScale[$AxisID]["RowHeight"],"XMin"=>$ManualScale[$AxisID]["Min"],"XMax"=>$ManualScale[$AxisID]["Max"]);
+       } else
         {
          $MaxDivs = floor($Width/$MinDivHeight);
          $Scale   = $this->pChartObject->computeScale($Data["Axis"][$AxisID]["Min"],$Data["Axis"][$AxisID]["Max"],$MaxDivs,$Factors,$AxisID);
@@ -161,8 +158,7 @@ 
          $AxisR = $AxisSettings["Color"]["R"]; $AxisG = $AxisSettings["Color"]["G"]; $AxisB = $AxisSettings["Color"]["B"];
          $TickR = $AxisSettings["Color"]["R"]; $TickG = $AxisSettings["Color"]["G"]; $TickB = $AxisSettings["Color"]["B"];
          $this->pChartObject->setFontProperties(array("R"=>$AxisSettings["Color"]["R"],"G"=>$AxisSettings["Color"]["G"],"B"=>$AxisSettings["Color"]["B"]));
-        }
-       else
+        } else
         {
          $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
          $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
@@ -180,8 +176,7 @@ 
            if ( $XLabelsRotation > 180 && $XLabelsRotation < 360 ) { $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
 
            if ( $Floating )
-            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1,$AxisPos["B"],$this->pChartObject->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -199,8 +194,9 @@ 
              if ( $LastX != NULL && $CycleBackground  && ( $DrawXLines == ALL || in_array($AxisID,$DrawXLines) )) { $this->pChartObject->drawFilledRectangle($LastX,$this->pChartObject->GraphAreaY1+$FloatingOffset,$XPos,$this->pChartObject->GraphAreaY2-$FloatingOffset,$BGColor); }
 
              if ( $DrawXLines == ALL || in_array($AxisID,$DrawXLines) ) { $this->pChartObject->drawLine($XPos,$this->pChartObject->GraphAreaY1+$FloatingOffset,$XPos,$this->pChartObject->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
-             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] )
-              $this->pChartObject->drawLine($XPos+$SubTicksSize,$YPos-$InnerSubTickWidth,$XPos+$SubTicksSize,$YPos+$OuterSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] ) {
+                           $this->pChartObject->drawLine($XPos+$SubTicksSize,$YPos-$InnerSubTickWidth,$XPos+$SubTicksSize,$YPos+$OuterSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             }
 
              $this->pChartObject->drawLine($XPos,$YPos-$InnerTickWidth,$XPos,$YPos+$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
              $Bounds    = $this->pChartObject->drawText($XPos,$YPos+$OuterTickWidth+$LabelOffset,$Value,array("Angle"=>$XLabelsRotation,"Align"=>$LabelAlign));
@@ -221,8 +217,7 @@ 
             }
 
            $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
-          }
-         elseif ( $AxisSettings["Position"] == AXIS_POSITION_TOP )
+          } elseif ( $AxisSettings["Position"] == AXIS_POSITION_TOP )
           {
            if ( $XLabelsRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $LabelOffset = 2; }
            if ( $XLabelsRotation > 0 && $XLabelsRotation < 190 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
@@ -230,8 +225,7 @@ 
            if ( $XLabelsRotation > 180 && $SLabelxRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $LabelOffset = 5; }
 
            if ( $Floating )
-            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1,$AxisPos["T"],$this->pChartObject->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -250,8 +244,9 @@ 
 
              if ( $DrawXLines == ALL || in_array($AxisID,$DrawXLines) ) { $this->pChartObject->drawLine($XPos,$this->pChartObject->GraphAreaY1+$FloatingOffset,$XPos,$this->pChartObject->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] )
-              $this->pChartObject->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] ) {
+                           $this->pChartObject->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             }
 
              $this->pChartObject->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
              $Bounds = $this->pChartObject->drawText($XPos,$YPos-$OuterTickWidth-$LabelOffset,$Value,array("Angle"=>$XLabelsRotation,"Align"=>$LabelAlign));
@@ -273,15 +268,13 @@ 
 
            $AxisPos["T"] = $MinTop - $ScaleSpacing;
           }
-        }
-       elseif ( $AxisSettings["Identity"] == AXIS_Y )
+        } elseif ( $AxisSettings["Identity"] == AXIS_Y )
         {
          if ( $AxisSettings["Position"] == AXIS_POSITION_LEFT )
           {
 
            if ( $Floating )
-            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1,$AxisPos["L"],$this->pChartObject->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -300,8 +293,9 @@ 
 
              if ( ($YPos != $this->pChartObject->GraphAreaY1 && $YPos != $this->pChartObject->GraphAreaY2) && ($DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$FloatingOffset,$YPos,$this->pChartObject->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] )
-              $this->pChartObject->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] ) {
+                           $this->pChartObject->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             }
 
              $this->pChartObject->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
              $Bounds  = $this->pChartObject->drawText($XPos-$OuterTickWidth-2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
@@ -322,13 +316,11 @@ 
             }
 
            $AxisPos["L"] = $MinLeft - $ScaleSpacing;
-          }
-         elseif ( $AxisSettings["Position"] == AXIS_POSITION_RIGHT )
+          } elseif ( $AxisSettings["Position"] == AXIS_POSITION_RIGHT )
           {
 
            if ( $Floating )
-            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1,$AxisPos["R"],$this->pChartObject->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -347,8 +339,9 @@ 
 
              if ( ($YPos != $this->pChartObject->GraphAreaY1 && $YPos != $this->pChartObject->GraphAreaY2) && ($DrawYLines == ALL || in_array($AxisID,$DrawYLines)) ) { $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$FloatingOffset,$YPos,$this->pChartObject->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
 
-             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] )
-              $this->pChartObject->drawLine($XPos-$InnerSubTickWidth,$YPos-$SubTicksSize,$XPos+$OuterSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             if ( $DrawSubTicks && $i != $AxisSettings["Rows"] ) {
+                           $this->pChartObject->drawLine($XPos-$InnerSubTickWidth,$YPos-$SubTicksSize,$XPos+$OuterSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+             }
 
              $this->pChartObject->drawLine($XPos-$InnerTickWidth,$YPos,$XPos+$OuterTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
              $Bounds  = $this->pChartObject->drawText($XPos+$OuterTickWidth+2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
@@ -406,8 +399,7 @@ 
          if ( $ImageMapTitle == NULL ) { $Description = $Data["Series"][$Series["X"]]["Description"]." / ".$Data["Series"][$Series["Y"]]["Description"]; } else { $Description = $ImageMapTitle; }
          
          if ( isset($Series["Picture"]) && $Series["Picture"] != "" )
-          { $Picture = $Series["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->pChartObject->getPicInfo($Picture); }
-         else
+          { $Picture = $Series["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->pChartObject->getPicInfo($Picture); } else
           { $Picture = NULL; }
 
          $PosArrayX = $this->getPosArray($SerieValuesX,$SerieXAxis);
@@ -427,13 +419,11 @@ 
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($PlotSize+$BorderSize),$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
 
              if( isset($Series["Shape"]) )
-              { $this->pChartObject->drawShape($X,$Y,$Series["Shape"],$PlotSize,$PlotBorder,$BorderSize,$Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"],$Series["Color"]["Alpha"],$BorderR,$BorderG,$BorderB,$BorderAlpha); }
-             elseif ( $Picture == NULL )
+              { $this->pChartObject->drawShape($X,$Y,$Series["Shape"],$PlotSize,$PlotBorder,$BorderSize,$Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"],$Series["Color"]["Alpha"],$BorderR,$BorderG,$BorderB,$BorderAlpha); } elseif ( $Picture == NULL )
               {
                if ( $PlotBorder ) { $this->pChartObject->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,$BorderColor); }
                $this->pChartObject->drawFilledCircle($X,$Y,$PlotSize,$Color);
-              }
-             else
+              } else
               { $this->pChartObject->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
             }
           }
@@ -483,8 +473,9 @@ 
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
             }
 
-           if ( $X != VOID && $Y != VOID && $LastX != VOID && $LastY != VOID)
-            $this->pChartObject->drawLine($LastX,$LastY,$X,$Y,$Color);
+           if ( $X != VOID && $Y != VOID && $LastX != VOID && $LastY != VOID) {
+                       $this->pChartObject->drawLine($LastX,$LastY,$X,$Y,$Color);
+           }
 
            $LastX = $X; $LastY = $Y;
           }
@@ -564,15 +555,15 @@ 
        $Result = "";
        foreach($Values as $Key => $Value)
         {
-         if ( $Value == VOID ) 
-          $Result[] = VOID;
-         else
-          $Result[] = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"]));
+         if ( $Value == VOID ) {
+                   $Result[] = VOID;
+         } else {
+                   $Result[] = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"]));
+         }
         }
 
        if ( count($Result) == 1 ) { return($Result[0]); } else { return($Result); }
-      }
-     else
+      } else
       {
        $Height      = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
@@ -581,10 +572,11 @@ 
        $Result = "";
        foreach($Values as $Key => $Value)
         {
-         if ( $Value == VOID ) 
-          $Result[] = VOID;
-         else
-          $Result[] = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"]));
+         if ( $Value == VOID ) {
+                   $Result[] = VOID;
+         } else {
+                   $Result[] = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"]));
+         }
         }
 
        if ( count($Result) == 1 ) { return($Result[0]); } else { return($Result); }
@@ -650,8 +642,7 @@ 
 
            $Lines = preg_split("/\n/",$Series["Description"]);
            $vY = $vY + max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
+          } elseif ( $Mode == LEGEND_HORIZONTAL )
           {
            $Lines = preg_split("/\n/",$Series["Description"]);
            $Width = "";
@@ -675,10 +666,11 @@ 
      $TopOffset  = $Y - $Boundaries["T"];
      if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
 
-     if ( $Style == LEGEND_ROUND )
-      $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-     elseif ( $Style == LEGEND_BOX )
-      $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     if ( $Style == LEGEND_ROUND ) {
+           $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     } elseif ( $Style == LEGEND_BOX ) {
+           $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     }
 
      $RestoreShadow = $this->pChartObject->Shadow; $this->Shadow = FALSE;
      foreach($Data["ScatterSeries"] as $Key => $Series)
@@ -695,8 +687,7 @@ 
            $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
 
            $this->pChartObject->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
-          }
-         else
+          } else
           {
            if ( $Family == LEGEND_FAMILY_BOX )
             {
@@ -705,13 +696,11 @@ 
 
              $this->pChartObject->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->pChartObject->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_CIRCLE )
+            } elseif ( $Family == LEGEND_FAMILY_CIRCLE )
             {
              $this->pChartObject->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->pChartObject->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_LINE )
+            } elseif ( $Family == LEGEND_FAMILY_LINE )
             {
              $this->pChartObject->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
              $this->pChartObject->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
@@ -721,12 +710,12 @@ 
          if ( $Mode == LEGEND_VERTICAL )
           {
            $Lines = preg_split("/\n/",$Series["Description"]);
-           foreach($Lines as $Key => $Value)
-            $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
+           foreach($Lines as $Key => $Value) {
+                       $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
+           }
 
            $Y=$Y+max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
+          } elseif ( $Mode == LEGEND_HORIZONTAL )
           {
            $Lines = preg_split("/\n/",$Series["Description"]);
            $Width = "";
@@ -789,8 +778,7 @@ 
 
            $Lines = preg_split("/\n/",$Series["Description"]);
            $vY = $vY + max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
+          } elseif ( $Mode == LEGEND_HORIZONTAL )
           {
            $Lines = preg_split("/\n/",$Series["Description"]);
            $Width = "";
@@ -859,8 +847,7 @@ 
            $X2 = $X1;
            $Y1 = $this->pChartObject->GraphAreaY1;
            $Y2 = $this->pChartObject->GraphAreaY2;
-          }
-         else
+          } else
           {
            $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
            $B = (($Sy)-($M*$Sx))/($n);
@@ -894,8 +881,9 @@ 
 
      if ( !is_array($Points) ) { $Point = $Points; $Points = ""; $Points[0] = $Point; }
 
-     if ( !isset($Data["ScatterSeries"][$ScatterSerieID]) ) 
-      return(0);
+     if ( !isset($Data["ScatterSeries"][$ScatterSerieID]) ) {
+           return(0);
+     }
 
      $Series = $Data["ScatterSeries"][$ScatterSerieID];
      $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
@@ -913,10 +901,11 @@ 
          $X = floor($PosArrayX[$Point]);
          $Y = floor($PosArrayY[$Point]);
 
-         if ( $DrawPoint == LABEL_POINT_CIRCLE )
-          $this->pChartObject->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
-         elseif ( $DrawPoint == LABEL_POINT_BOX )
-          $this->pChartObject->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+         if ( $DrawPoint == LABEL_POINT_CIRCLE ) {
+                   $this->pChartObject->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+         } elseif ( $DrawPoint == LABEL_POINT_BOX ) {
+                   $this->pChartObject->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+         }
 
          $Serie = "";
          $Serie["R"] = $Series["Color"]["R"];
@@ -938,10 +927,11 @@ 
 
          $Caption = $XValue." / ".$YValue;
 
-         if ( isset($Series["Description"]) )
-          $Description = $Series["Description"];
-         else
-          $Description = "No description";
+         if ( isset($Series["Description"]) ) {
+                   $Description = $Series["Description"];
+         } else {
+                   $Description = "No description";
+         }
 
          $Series = "";
          $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
@@ -1014,16 +1004,14 @@ 
        if ( $WriteCaption )
         {
          if ( $CaptionAlign == CAPTION_LEFT_TOP )
-          { $X = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-         else 
+          { $X = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; } else 
           { $X = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"] - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
 
          $this->pChartObject->drawText($X,$Y,$Caption,$CaptionSettings);
         }
 
        return(array("Y"=>$Y));
-      }
-     elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
+      } elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
       {
        $X  = $this->getPosArray($Value,$AxisID);
        $Y1 = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"];
@@ -1040,8 +1028,7 @@ 
        if ( $WriteCaption )
         {
          if ( $CaptionAlign == CAPTION_LEFT_TOP )
-          { $Y = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-         else 
+          { $Y = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; } else 
           { $Y = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
 
          $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
@@ -1121,8 +1108,7 @@ 
 
        $this->pChartObject->Shadow = $RestoreShadow;
        return(array("X1"=>$X1,"X2"=>$X2));
-      }
-     elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y )
+      } elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y )
       {
        $X1 = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"];
        $X2 = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"];

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

Braces +15 added lines, -12 removed lines

@@ -56,10 +56,11 @@ 
      $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;
+     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 */
@@ -81,10 +82,11 @@ 
 
      foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
       {
-       if ( isset($Data["Series"][$LabelSerie]["Data"][$Key]) )
-        $Label = $Data["Series"][$LabelSerie]["Data"][$Key];
-       else
-        $Label = "-";
+       if ( isset($Data["Series"][$LabelSerie]["Data"][$Key]) ) {
+               $Label = $Data["Series"][$LabelSerie]["Data"][$Key];
+       } else {
+               $Label = "-";
+       }
 
        $LeftY1 = $LeftY;
        $LeftY2 = $LeftY + $Value * $YScale;
@@ -118,10 +120,11 @@ 
 
        $Object->drawPolygon($PolyGon,$Settings);
 
-       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));
+       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));
+       }
 
        $LeftY  = $LeftY2;
        $RightY = $RightY2;

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

Braces +19 added lines, -24 removed lines

@@ -98,8 +98,7 @@ 
        imagefilledrectangle($this->Picture, 0,0,$XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
        imagealphablending($this->Picture,TRUE);
        imagesavealpha($this->Picture,true); 
-      }
-     else
+      } else
       {
        $C_White = $this->AllocateColor($this->Picture,255,255,255);
        imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
@@ -170,10 +169,11 @@ 
    /* Automatic output method based on the calling interface */
    function autoOutput($FileName="output.png")
     {
-     if (php_sapi_name() == "cli")
-      $this->Render($FileName);
-     else
-      $this->Stroke();
+     if (php_sapi_name() == "cli") {
+           $this->Render($FileName);
+     } else {
+           $this->Stroke();
+     }
     }
 
    /* Return the length between two points */
@@ -245,11 +245,13 @@ 
      if ( $B != -1)       {  $this->FontColorB = $B; }
      if ( $Alpha != NULL) {  $this->FontColorA = $Alpha; }
 
-     if ( $FontName != NULL  )
-      $this->FontName = $FontName;
+     if ( $FontName != NULL  ) {
+           $this->FontName = $FontName;
+     }
  
-     if ( $FontSize != NULL  )
-      $this->FontSize = $FontSize;
+     if ( $FontSize != NULL  ) {
+           $this->FontSize = $FontSize;
+     }
     }
 
    /* Returns the 1st decimal values (used to correct AA bugs) */
@@ -277,8 +279,7 @@ 
       {
        if(!isset($_SESSION)) { session_start(); }
        $_SESSION[$this->ImageMapIndex]    = NULL;
-      }
-     elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
+      } elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
       {
        $this->ImageMapFileName 		= $UniqueID;
        $this->ImageMapStorageFolder	= $StorageFolder;
@@ -306,8 +307,7 @@ 
       {
        if(!isset($_SESSION)) { $this->initialiseImageMap(); }
        $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
-      }
-     elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
+      } elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
       {
        $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'a');
        fwrite($Handle, $Type.IMAGE_MAP_DELIMITER.$Plots.IMAGE_MAP_DELIMITER.$Color.IMAGE_MAP_DELIMITER.$Title.IMAGE_MAP_DELIMITER.$Message."\r\n");
@@ -337,11 +337,9 @@ 
       {
        if(!isset($_SESSION)) { return(-1); }
        if ( is_array($NewTitle) )
-        { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } }
-       else
+        { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } } else
         { foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+      } elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
       {
        $TempArray = "";
        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
@@ -355,8 +353,7 @@ 
          fclose($Handle);
 
          if ( is_array($NewTitle) )
-          { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
-         else
+          { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } } else
           { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
 
          $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
@@ -378,8 +375,7 @@ 
       {
        if(!isset($_SESSION)) { return(-1); }
        foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+      } elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
       {
        $TempArray = "";
        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
@@ -416,8 +412,7 @@ 
          foreach($_SESSION[$Name] as $Key => $Params)
           { echo $Params[0].IMAGE_MAP_DELIMITER.$Params[1].IMAGE_MAP_DELIMITER.$Params[2].IMAGE_MAP_DELIMITER.$Params[3].IMAGE_MAP_DELIMITER.$Params[4]."\r\n"; }
         }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+      } elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
       {
        if (file_exists($StorageFolder."/".$UniqueID.".map"))
         {

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

Braces +126 added lines, -121 removed lines

@@ -124,9 +124,9 @@ 
      $Offset = 0; $ID = 0;
      foreach($Values as $Key => $Value)
       {
-       if ( $Shadow )
-        $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
-       else
+       if ( $Shadow ) {
+               $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+       } else
         {
          if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
          $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
@@ -134,9 +134,9 @@ 
 
        if ( !$SecondPass && !$Shadow )
         {
-         if ( !$Border )
-          $Settings["Surrounding"] = 10;
-         else
+         if ( !$Border ) {
+                   $Settings["Surrounding"] = 10;
+         } else
           { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
         }
 
@@ -145,8 +145,7 @@ 
 
        $Angle = ($EndAngle - $Offset)/2 + $Offset;
        if ($DataGapAngle == 0)
-        { $X0 = $X; $Y0 = $Y; }
-       else
+        { $X0 = $X; $Y0 = $Y; } else
         {
          $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
          $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
@@ -173,8 +172,7 @@ 
        if ( $DrawLabels && !$Shadow && !$SecondPass )
         {
          if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-         else
+          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
           { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -183,10 +181,11 @@ 
 
          $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
 
-         if ( $LabelStacked )
-          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
-         else
-          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+         if ( $LabelStacked ) {
+                   $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
+         } else {
+                   $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+         }
         }
 
        $Offset = $i + $DataGapAngle; $ID++;
@@ -200,21 +199,21 @@ 
        foreach($Values as $Key => $Value)
         {
          $FirstPoint = TRUE;
-         if ( $Shadow )
-          $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
-         else
+         if ( $Shadow ) {
+                   $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+         } else
           {
-           if ( $Border )
-            $Settings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB);
-           else
-            $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+           if ( $Border ) {
+                       $Settings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB);
+           } else {
+                       $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+           }
           }
 
          $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
 
          if ($DataGapAngle == 0)
-          { $X0 = $X; $Y0 = $Y; }
-         else
+          { $X0 = $X; $Y0 = $Y; } else
           {
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
            $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
@@ -236,8 +235,7 @@ 
          if ( $DrawLabels && !$Shadow )
           {
            if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-            { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-           else
+            { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
             { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -246,10 +244,11 @@ 
 
            $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
 
-           if ( $LabelStacked )
-            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
-           else
-            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+           if ( $LabelStacked ) {
+                       $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
+           } else {
+                       $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+           }
           }
   
          $Offset = $i + $DataGapAngle; $ID++;
@@ -270,17 +269,17 @@ 
           {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
            $Yc = sin(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $Y;
-          }
-         else
+          } else
           {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
            $Yc = sin(($Angle-90)*PI/180) * ($Radius)/2 + $Y;
           }
 
-         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
-          $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
-         elseif ( $WriteValues == PIE_VALUE_NATURAL )
-          $Display = $Value.$ValueSuffix;
+         if ( $WriteValues == PIE_VALUE_PERCENTAGE ) {
+                   $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+         } elseif ( $WriteValues == PIE_VALUE_NATURAL ) {
+                   $Display = $Value.$ValueSuffix;
+         }
 
          $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
 
@@ -385,8 +384,7 @@ 
        if ( $EndAngle < 180 )   { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
 
        if ($DataGapAngle == 0)
-        { $X0 = $X; $Y0 = $Y; }
-       else
+        { $X0 = $X; $Y0 = $Y; } else
         {
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
          $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
@@ -453,9 +451,11 @@ 
          if ( $Border )
           { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30;; }
   
-         if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
+         if ( isset($SliceAngle[$SliceID][1]) ) {
+             /* Empty error handling */
           {
            $Angle = $SliceAngle[$SliceID][1];
+         }
            $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
            $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
            $this->pChartObject->drawLine($Plots[0],$Plots[1],$Xc,$Yc,$Settings);
@@ -476,9 +476,11 @@ 
        $Settings = $SliceColors[$SliceID];
        $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
 
-       if ( $Visible[$SliceID]["Start"] && isset($Plots[2])) /* Empty error handling */
+       if ( $Visible[$SliceID]["Start"] && isset($Plots[2])) {
+           /* Empty error handling */
         {
          $this->pChartObject->drawLine($Plots[2],$Plots[3],$Plots[2],$Plots[3]- $SliceHeight,array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]));
+       }
          $Border = "";
          $Border[] = $Plots[0]; $Border[] = $Plots[1]; $Border[] = $Plots[0]; $Border[] = $Plots[1] - $SliceHeight;
          $Border[] = $Plots[2]; $Border[] = $Plots[3] - $SliceHeight; $Border[] = $Plots[2]; $Border[] = $Plots[3]; 
@@ -529,9 +531,11 @@ 
          if ( $Border )
           { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30; }
   
-         if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
+         if ( isset($SliceAngle[$SliceID][1]) ) {
+             /* Empty error handling */
           {
            $Angle = $SliceAngle[$SliceID][1];
+         }
            if ( $Angle < 270 && $Angle > 90 )
             {
              $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
@@ -587,21 +591,20 @@ 
        foreach($Values as $Key => $Value)
         {
          $FirstPoint = TRUE;
-         if ( $Shadow )
-          $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
-         else
+         if ( $Shadow ) {
+                   $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
+         } else
           {
            if ( $Border )
-            { $Settings = array("R"=>$Palette[$ID]["R"]+30,"G"=>$Palette[$ID]["G"]+30,"B"=>$Palette[$ID]["B"]+30,"Alpha"=>$Palette[$ID]["Alpha"]); }
-           else
-            $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+            { $Settings = array("R"=>$Palette[$ID]["R"]+30,"G"=>$Palette[$ID]["G"]+30,"B"=>$Palette[$ID]["B"]+30,"Alpha"=>$Palette[$ID]["Alpha"]); } else {
+                       $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
+           }
           }
 
          $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
 
          if ($DataGapAngle == 0)
-          { $X0 = $X; $Y0 = $Y- $SliceHeight; }
-         else
+          { $X0 = $X; $Y0 = $Y- $SliceHeight; } else
           {
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
            $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
@@ -640,17 +643,17 @@ 
           {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
            $Yc = sin(($Angle-90)*PI/180) * (($Radius*$SkewFactor)+$ValuePadding) + $Y - $SliceHeight;
-          }
-         else
+          } else
           {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
            $Yc = sin(($Angle-90)*PI/180) * ($Radius*$SkewFactor)/2 + $Y - $SliceHeight;
           }
 
-         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
-          $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
-         elseif ( $WriteValues == PIE_VALUE_NATURAL )
-          $Display = $Value.$ValueSuffix;
+         if ( $WriteValues == PIE_VALUE_PERCENTAGE ) {
+                   $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+         } elseif ( $WriteValues == PIE_VALUE_NATURAL ) {
+                   $Display = $Value.$ValueSuffix;
+         }
 
          $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
 
@@ -665,8 +668,7 @@ 
        foreach($Values as $Key => $Value)
         {
          if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-         else
+          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
           { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
          $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
@@ -679,10 +681,11 @@ 
           {
            $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$ID];
 
-           if ( $LabelStacked )
-            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius,TRUE);
-           else
-            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+           if ( $LabelStacked ) {
+                       $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius,TRUE);
+           } else {
+                       $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+           }
           }
 
          $Offset = $EndAngle - $DataGapAngle; $ID--;
@@ -740,8 +743,7 @@ 
          if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
          if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$BoxSize/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$BoxSize/2; }
          $vY=$vY+$YStep;
-        }
-       elseif ( $Mode == LEGEND_HORIZONTAL )
+        } elseif ( $Mode == LEGEND_HORIZONTAL )
         {
          if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$BoxSize/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$BoxSize/2; }
          if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
@@ -754,10 +756,11 @@ 
      $TopOffset  = $Y - $Boundaries["T"];
      if ( $Boundaries["B"]-($vY+$BoxSize) < $TopOffset ) { $Boundaries["B"] = $vY+$BoxSize+$TopOffset; }
 
-     if ( $Style == LEGEND_ROUND )
-      $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
-     elseif ( $Style == LEGEND_BOX )
-      $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     if ( $Style == LEGEND_ROUND ) {
+           $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     } elseif ( $Style == LEGEND_BOX ) {
+           $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     }
 
      $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE;
      foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
@@ -770,8 +773,7 @@ 
         {
          $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
          $Y=$Y+$YStep;
-        }
-       elseif ( $Mode == LEGEND_HORIZONTAL )
+        } elseif ( $Mode == LEGEND_HORIZONTAL )
         {
          $BoxArray = $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
          $X=$BoxArray[1]["X"]+2+$XStep;
@@ -809,8 +811,7 @@ 
        $Settings["Size"]   = 8;
 
        $this->pChartObject->drawArrowLabel($X,$Y," ".$Label." ",$Settings);
-      }
-     else
+      } else
       {
        $X2 = cos(deg2rad($Angle-90))*20+$X;
        $Y2 = sin(deg2rad($Angle-90))*20+$Y;
@@ -873,8 +874,7 @@ 
         {
          $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
          $this->pChartObject->drawText($X3+2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
-        }
-       else
+        } else
         {
          $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
          $this->pChartObject->drawText($X3-2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
@@ -964,16 +964,16 @@ 
         {
          $Settings    = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
          $BorderColor = $Settings;
-        }
-       else
+        } else
         {
          if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
          $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
 
-         if ( $Border )
-          $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
-         else
-          $BorderColor = $Settings;
+         if ( $Border ) {
+                   $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+         } else {
+                   $BorderColor = $Settings;
+         }
         }
 
        $Plots = ""; $Boundaries = ""; $AAPixels = "";
@@ -1026,8 +1026,7 @@ 
        if ( $DrawLabels && !$Shadow )
         {
          if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-         else
+          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
           { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -1036,10 +1035,11 @@ 
 
          $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
 
-         if ( $LabelStacked )
-          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
-         else
-          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+         if ( $LabelStacked ) {
+                   $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
+         } else {
+                   $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+         }
         }
 
        $Offset = $Lasti; $ID++;
@@ -1065,20 +1065,20 @@ 
            if ( $Angle > 90 && $Angle <= 180 ) { $Align = TEXT_ALIGN_TOPLEFT; }
            if ( $Angle > 180 && $Angle <= 270 ) { $Align = TEXT_ALIGN_TOPRIGHT; }
            if ( $Angle > 270 ) { $Align = TEXT_ALIGN_BOTTOMRIGHT; }
-          }
-         else
+          } else
           {
            $Xc = cos(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $X;
            $Yc = sin(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $Y;
            $Align = TEXT_ALIGN_MIDDLEMIDDLE;
           }
 
-         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
-          $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
-         elseif ( $WriteValues == PIE_VALUE_NATURAL )
-          $Display = $Value.$ValueSuffix;
-         else
-          $Label = "";
+         if ( $WriteValues == PIE_VALUE_PERCENTAGE ) {
+                   $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+         } elseif ( $WriteValues == PIE_VALUE_NATURAL ) {
+                   $Display = $Value.$ValueSuffix;
+         } else {
+                   $Label = "";
+         }
 
          $this->pChartObject->drawText($Xc,$Yc,$Display,array("Align"=>$Align,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB));
          $Offset = $EndAngle;
@@ -1249,8 +1249,9 @@ 
        $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
        $this->pChartObject->drawPolygon($Plots["BottomPoly"],$Settings);
 
-       foreach($Plots["AA"] as $Key => $Pos)
-        $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$Settings);
+       foreach($Plots["AA"] as $Key => $Pos) {
+               $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$Settings);
+       }
 
        $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["OutX2"],$Plots["OutY2"],$Settings);
        $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["OutX1"],$Plots["OutY1"],$Settings);
@@ -1268,10 +1269,12 @@ 
        $StartAngle = $Plots["Angle"][0];
        foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
 
-       if ( $StartAngle >= 270 || $StartAngle <= 90 )
-        $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
-       if ( $StartAngle >= 270 || $StartAngle <= 90 )
-        $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+       if ( $StartAngle >= 270 || $StartAngle <= 90 ) {
+               $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
+       }
+       if ( $StartAngle >= 270 || $StartAngle <= 90 ) {
+               $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+       }
 
         $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Settings);
         $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Settings);
@@ -1288,8 +1291,7 @@ 
        foreach($Plots["Angle"] as $ID => $Angle)
         {
          if ( $Angle == VOID )
-          { $Outer = FALSE; $Inner = TRUE; }
-         elseif( $Inner )
+          { $Outer = FALSE; $Inner = TRUE; } elseif( $Inner )
           {
            if (( $Angle < 90 || $Angle > 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
             {
@@ -1356,10 +1358,12 @@ 
        $StartAngle = $Plots["Angle"][0];
        foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
 
-       if ( $StartAngle <= 270 && $StartAngle >= 90 )
-        $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
-       if ( $EndAngle <= 270 && $EndAngle >= 90 )
-        $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+       if ( $StartAngle <= 270 && $StartAngle >= 90 ) {
+               $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
+       }
+       if ( $EndAngle <= 270 && $EndAngle >= 90 ) {
+               $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+       }
       }
 
 
@@ -1374,8 +1378,7 @@ 
        foreach($Plots["Angle"] as $ID => $Angle)
         {
          if ( $Angle == VOID )
-          { $Outer = FALSE; $Inner = TRUE; }
-         elseif( $Outer )
+          { $Outer = FALSE; $Inner = TRUE; } elseif( $Outer )
           {
            if ( ( $Angle > 90 && $Angle < 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
             {
@@ -1405,8 +1408,9 @@ 
 
        if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots["TopPoly"]),$this->pChartObject->toHTMLColor($Settings["R"],$Settings["G"],$Settings["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$SliceID],$Data["Series"][$DataSerie]["Data"][count($Slices)-$SliceID-1]); }
 
-       foreach($Plots["AA"] as $Key => $Pos)
-        $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1]-$SliceHeight,$Settings);
+       foreach($Plots["AA"] as $Key => $Pos) {
+               $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1]-$SliceHeight,$Settings);
+       }
 
        $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
        $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
@@ -1421,25 +1425,26 @@ 
          $EndAngle   = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
 
          if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-         else
+          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
           { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
          $Xc = cos(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius) + $X;
          $Yc = sin(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius)*$SkewFactor + $Y;
 
-         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
-          $Label = $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
-         elseif ( $WriteValues == PIE_VALUE_NATURAL )
-          $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
-         else
-          $Label = "";
-
-         if ( $LabelStacked )
-          $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
-         else
-          $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,FALSE);
+         if ( $WriteValues == PIE_VALUE_PERCENTAGE ) {
+                   $Label = $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+         } elseif ( $WriteValues == PIE_VALUE_NATURAL ) {
+                   $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
+         } else {
+                   $Label = "";
+         }
+
+         if ( $LabelStacked ) {
+                   $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
+         } else {
+                   $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,FALSE);
+         }
 
          $Offset = $EndAngle - $DataGapAngle; $ID--; $Slice++;
         }