Changeset 51 for branches

Timestamp:

Feb 20, 2015, 9:21:01 AM (10 years ago)

Author:

chronos

Message:

• Modify: If measure not found then use default one.

Location:

branches/old

Files:

• add.php (modified) (2 diffs)
• admin.php (modified) (1 diff)
• classes.php (modified) (1 diff)
• code.php (modified) (1 diff)
• config.sample.php (modified) (1 diff)
• create_groups.php (modified) (2 diffs)
• database.php (modified) (1 diff)
• error.php (modified) (1 diff)
• graph.php (modified) (13 diffs)
• index.php (modified) (1 diff)
• rebuild.php (modified) (1 diff)
• sql/23_data.sql (modified) (1 diff)
• stat_functions.php (modified) (1 diff)
• types.php (modified) (1 diff)

branches/old/add.php

@@ -1 @@
-<?
+<?php
+
 include('global.php');
 
@@ -10 +11 @@
   {
     AddValue($Measure, $Value);
-    echo('Hodnota '.$Value.' uložena');
-  } else echo('Nemáte oprávnění k aktualizaci zadané veličiny!<br>Vaše adresa: '.gethostbyaddr($_SERVER['REMOTE_ADDR']).'('.$_SERVER['REMOTE_ADDR'].')');
+    echo('Hodnota '.$Value.' uložena');
+  } else echo('Nemáte oprávnění k aktualizaci zadané veličiny!<br>Vaše adresa: '.gethostbyaddr($_SERVER['REMOTE_ADDR']).'('.$_SERVER['REMOTE_ADDR'].')');
 } else echo('Nebyly zadány potřebné parametry');

branches/old/admin.php

@@ -65 +65 @@
   echo('Dokončeno<br>');         
 }
-
-?>

branches/old/classes.php

@@ -16 +16 @@
   ),
 );
-
-?>

branches/old/code.php

@@ -559 +559 @@
     return $string;
 }
-?>

branches/old/config.sample.php

@@ -28 +28 @@
   'ImageHeight' => 200,
   'ValueToImageHeigthCoefficient' => 0.9,
-  'FontFileName' => 'arial.ttf',
+  'FontFileName' => './arial.ttf',
   'FontSize' => 10,
   'DefaultVariables' => array(

branches/old/create_groups.php

@@ -1 @@
-<?
+<?php
 
 include('error.php');
@@ -16 +16 @@
   for($Level=)         
 }
-?>

branches/old/database.php

@@ -69 +69 @@
     $this->query('SET CHARACTER SET '.$Charset);
   }
-
 }

branches/old/error.php

@@ -64 +64 @@
 
 set_error_handler('obsluha_chyb');                              // Aktivuj novou obsluhu chyb
-
-?>

branches/old/graph.php

@@ -1 +1 @@
 <?php
+
 include('global.php');
-  
+
 if(array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug']; 
   else $Debug = 0;
-  
+
 if(!array_key_exists('From',$_GET)) die('Musíte zadat čas počátku');
 $StartTime = addslashes($_GET['From']);
@@ -28 +29 @@
 if($Level < 0) $Level = 0;
 if($Level > $MaxLevel) $Level = $MaxLevel;
-//$Level = 0;
-
 
 $Points = GetValues($Measure, $StartTime, $EndTime, $Level);
@@ -54 +53 @@
 //$MinValue = round($MinValue * $Measure['Divider']) / $Measure['Divider'];
 //$MaxValue = round($MaxValue * $Measure['Divider']) / $Measure['Divider'];
-$AvgValue = $AvgValue / count($Points); //round( * $Measure['Divider']) / $Measure['Divider'];
+$AvgValue = $AvgValue / count($Points); //round(* $Measure['Divider']) / $Measure['Divider'];
 
 // Generate polygon and recalculate y values to fit graph height 
@@ -61 +60 @@
 $PointsMax = array(0, $Height-1);
 if(($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
-{ 
+{
   foreach($Points as $Index => $Item)
   {
@@ -73 +72 @@
   }
 }
-$PointsMin[] = $Width-1;
-$PointsMin[] = $Height-1;
-$PointsAvg[] = $Width-1;
-$PointsAvg[] = $Height-1;
-$PointsMax[] = $Width-1;
-$PointsMax[] = $Height-1;
-$PointsMin[] = $Width-1;
-$PointsMin[] = $Height-1;
-$PointsAvg[] = $Width-1;
-$PointsAvg[] = $Height-1;
-$PointsMax[] = $Width-1;
-$PointsMax[] = $Height-1;
+$PointsMin[] = $Width - 1;
+$PointsMin[] = $Height - 1;
+$PointsAvg[] = $Width - 1;
+$PointsAvg[] = $Height - 1;
+$PointsMax[] = $Width - 1;
+$PointsMax[] = $Height - 1;
+$PointsMin[] = $Width - 1;
+$PointsMin[] = $Height - 1;
+$PointsAvg[] = $Width - 1;
+$PointsAvg[] = $Height - 1;
+$PointsMax[] = $Width - 1;
+$PointsMax[] = $Height - 1;
 
 
@@ -95 +94 @@
 
 // Generate image
-if(!$Debug) 
+if(!$Debug)
 {
   header("Content-type: image/png");
@@ -115 +114 @@
   imagefilledpolygon($Image, $PointsAvg, count($PointsAvg) / 2, $LightGreen);
   imagefilledpolygon($Image, $PointsMin, count($PointsMin) / 2, $LightBlue);
-  
+
   $TimeMarks = array(1, 60, 60*60, 60*60*24, 60*60*24*7, 60*60*24*30, 60*60*24*365, 60*60*24*365*10);
-  
+
   $TimeRange = $EndTime - $StartTime;
   $TimeMarksIndex = 0;
@@ -124 +123 @@
   $MajorTimeMarks = $TimeMarks[$TimeMarksIndex - 1];
   $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];  
-   
+
   $TimeShift = AlignTime($StartTime, $MajorTimeMarks) - $StartTime; 
   //imagestring($Image, 10, 40, 50, $TimeShift, $Black);
-  
+
   // Zobraz měřítko Y
   $VerticalLinesDistance = $Height / $VerticalLinesCount;
@@ -138 +137 @@
 
   $TimeShift = AlignTime($StartTime, $MinorTimeMarks) - $StartTime; 
- 
+
   // Zobraz měřítko X
   $LastTextEnd = 0;
@@ -155 +154 @@
     }
     else for($Y=0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
-  } 
-  
+  }
+
   // Popisky osy Y
-  for($I=1; $I<=$VerticalLinesCount; $I++)
+  for($I = 1; $I <= $VerticalLinesCount; $I++)
   {
     $Y = $Height - 1 - ($VerticalLinesDistance * $I);
@@ -166 +165 @@
     if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
       imagettftext($Image, $FontSize, 0, 2,  $Y - ($BoundBox[5] - $BoundBox[1]) / 2, $Black, $FontFile, $Text);
-  } 
+  }
   $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
 
@@ -175 +174 @@
   imagettftext($Image, $FontSize, 0, $Left, 14, $Red, $FontFile, $Text);
 
-  $Text = "    Avg.  ".AddPrefixMultipliers($AvgValue, $Measure['Unit']);
+  $Text = "    Avg.  ".AddPrefixMultipliers($AvgValue, $Measure['Unit'], 4);
   $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
   $Left -= ($BoundingBox[2] - $BoundingBox[0]);
@@ -192 +191 @@
   imagedestroy($Image);
 }
-
-?>

branches/old/index.php

@@ -156 +156 @@
     }
 $Output .= '<br>';
+
+$Result = $Database->select('measure', 'id', '(Enabled=1) AND ((PermissionView="all") OR (PermissionView="'.gethostbyaddr($_SERVER['REMOTE_ADDR']).'")) WHERE Id='.$_SESSION['Measure']);
+if($Result->num_rows == 0) $_SESSION['Measure'] = $Config['DefaultVariables']['Measure'];
 
 $Output .= '<strong>Graf:</strong><br>';

branches/old/rebuild.php

@@ -7 +7 @@
 
 //RebuildAllMeasuresCache();
-
-?>

branches/old/sql/23_data.sql

@@ -8 +8 @@
   `level` tinyint(4) NOT NULL default '0',
   KEY `time` (`time`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin2;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;

branches/old/stat_functions.php

@@ -24 +24 @@
 function TruncateDigits($Value, $Digits = 4)
 {
-  for($II = 2; $II > -1; $II--)
+  for($II = 2; $II > -6; $II--)
   {
     if($Value >= pow(10, $II))
     {
-      if($Digits < ($II + 1)) $RealDigits = $II + 1; else $RealDigits = $Digits;
+      if($Digits < ($II + 1)) $RealDigits = $II + 1; 
+        else $RealDigits = $Digits;
       $Value = round($Value / pow(10, $II - $RealDigits + 1)) * pow(10, $II - $RealDigits + 1);
       break;

branches/old/types.php

@@ -12 +12 @@
   ),
 );
-
-?>