Changeset 499

Timestamp:

10/26/08 17:14:05 (23 months ago)

Author:

PavelVinogradov

Message:

Use sams traffic count settings in PDF reports (Closes #183)

Files:

• branches/1.0.x/php/createpdf.php (modified) (5 diffs)

branches/1.0.x/php/createpdf.php

@@ -101 +101 @@
          $aaa=convert_cyr_string("$row_2[family] $row_2[name]","k","w");
          $pdfFile->Write(0, $aaa);
-         $pdfFile->SetXY(130, $ycount);
-         $aaa=ReturnTrafficFormattedSize($row[0]-$row[1]);
+         $pdfFile->SetXY(130, $ycount);
+         if($SAMSConf->realtraffic=="real")
+           $aaa=ReturnTrafficFormattedSize($row[0]-$row[1]);
+         else
+           $aaa=ReturnTrafficFormattedSize($row[0]);    
          $pdfFile->Write(0, $aaa);
          
@@ -108 +111 @@
          $size2=$size2+$row[0];
          $hitsize=$hitsize+$row[1];
-         $traf=$traf+$row[0]-$row[1];
+         if($SAMSConf->realtraffic=="real")
+           $traf=$traf+$row[0]-$row[1];
+         else
+           $traf=$traf+$row[0];
          $ycount+=7;
 
@@ -185 +191 @@
                    $pdfFile->Write(0, $row2[4]);
                    $pdfFile->SetXY(130, $ycount);
-                   $aaa=ReturnTrafficFormattedSize($row2[0]-$row2[4]);
+                   if($SAMSConf->realtraffic=="real")
+                     $aaa=ReturnTrafficFormattedSize($row2[0]-$row2[4]);
+                   else
+                     $aaa=ReturnTrafficFormattedSize($row2[0]);
                    $pdfFile->Write(0, " $aaa");
                
@@ -298 +307 @@
          if($SAMSConf->realtraffic=="real")
            {
-             $aaa=ReturnTrafficFormattedSize($row[0]-$row[1]);
+             if($SAMSConf->realtraffic=="real")
+               $aaa=ReturnTrafficFormattedSize($row[0]-$row[1]);
+             else
+               $aaa=ReturnTrafficFormattedSize($row[0]);
+
              pdf_show_xy($pdfFile, $aaa, 400, $ycount);  
            }
@@ -312 +325 @@
          $size2=$size2+$row[0];
          $hitsize=$hitsize+$row[1];
-         $traf=$traf+$row[0]-$row[1];
+         if($SAMSConf->realtraffic=="real")
+           $traf=$traf+$row[0]-$row[1];
+         else
+           $traf=$traf+$row[0];
          $ycount-=20;
          if($ycount==40)