Changeset 61 for trunk

Timestamp:

Dec 31, 2015, 11:02:23 PM (9 years ago)

Author:

chronos

Message:

• Added: Used ErrorHandler class Common package.
• Removed: Unused files.

Location:

trunk

Files:

• Packages/Common/Common.php (added)
• Packages/Common/Error.php (added)
• Packages/Common/Package.php (deleted)
• Packages/Common/RSS.php (modified) (2 diffs)
• code.php (deleted)
• create_groups.php (modified) (1 diff)
• database.php (deleted)
• error.php (deleted)
• global.php (modified) (3 diffs)
• graph.php (modified) (8 diffs)

trunk/Packages/Common/RSS.php

@@ -1 +1 @@
 <?php
 
-class RSS
+class RSS 
 {
   var $Charset;
@@ -9 +9 @@
   var $WebmasterEmail;
   var $Items;
-
+  
   function __construct()
   {

trunk/create_groups.php

@@ -1 +1 @@
 <?php
 
-include('error.php');
 include('stat_functions.php');
 include('db.php');

trunk/global.php

@@ -3 +3 @@
 session_start();
 $FileName = dirname(__FILE__).'/config.php';
-if(file_exists($FileName)) include($FileName);
+if(file_exists($FileName)) include_once($FileName);
 else {
   die('Configuration file "'.$FileName.'" not found.');
 }
-include_once('config.php');
 include_once('Version.php');
 include_once('types.php');
 include_once('classes.php');
-include_once('Packages/Common/Package.php');
+include_once('Packages/Common/Common.php');
 $PrefixMultiplier = new PrefixMultiplier();
+$ErrorHandler = new ErrorHandler();
+$ErrorHandler->Start();
+$ErrorHandler->ShowError = $Config['Web']['ShowError'];
 include_once('stat_functions.php');
 $Database = new Database();
@@ -55 +57 @@
 function MakeLink($Target, $Title)
 {
-  return('<a href="'.$Target.'">'.$Title.'</a>'); 
+  return('<a href="'.$Target.'">'.$Title.'</a>');
 }
 
@@ -87 +89 @@
   foreach($Class as $Index => $Item)
   {
-    if(!array_key_exists($Index, $Values)) $Values[$Index] = $Item['Default']; 
+    if(!array_key_exists($Index, $Values)) $Values[$Index] = $Item['Default'];
     switch($Item['Type'])
     {

trunk/graph.php

@@ -3 +3 @@
 include('global.php');
 
-if(array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug']; 
+if(array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug'];
   else $Debug = 0;
 
@@ -14 +14 @@
 if(!array_key_exists('Measure',$_GET)) die('Musíte zadat měřenou veličinu');
 $MeasureId = addslashes($_GET['Measure']);
-if(!array_key_exists('Width', $_GET)) $Width = $DefaultWidth; 
+if(!array_key_exists('Width', $_GET)) $Width = $DefaultWidth;
 else $Width = addslashes($_GET['Width']);
 if(!array_key_exists('Height', $_GET)) $Height = $DefaultHeight;
@@ -32 +32 @@
 $Points = GetValues($Measure, $StartTime, $EndTime, $Level);
 
-if($Debug) echo('Points count: '.count($Points).'<br>'); 
-//if($Debug) foreach($Points as $Index => $Item) 
+if($Debug) echo('Points count: '.count($Points).'<br>');
+//if($Debug) foreach($Points as $Index => $Item)
 //  echo($Index.': '.$Item['min'].'<br>');
 
@@ -55 +55 @@
 $AvgValue = $AvgValue / count($Points); //round(* $Measure['Divider']) / $Measure['Divider'];
 
-// Generate polygon and recalculate y values to fit graph height 
+// Generate polygon and recalculate y values to fit graph height
 $PointsMin = array(0, $Height-1);
 $PointsAvg = array(0, $Height-1);
@@ -97 +97 @@
 {
   Header("Content-type: image/png");
-  Header("Cache-Control: no-cache");    // Dynamic graph - no cache 
+  Header("Cache-Control: no-cache");    // Dynamic graph - no cache
   $Image = @imagecreate($Width, $Height);
   $BackgroundColor = imagecolorallocate($Image, 255, 255, 255);
@@ -122 +122 @@
   if($TimeMarksIndex < 2) $TimeMarksIndex = 2;
   $MajorTimeMarks = $TimeMarks[$TimeMarksIndex - 1];
-  $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];  
+  $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];
 
-  $TimeShift = AlignTime($StartTime, $MajorTimeMarks) - $StartTime; 
+  $TimeShift = AlignTime($StartTime, $MajorTimeMarks) - $StartTime;
   //imagestring($Image, 10, 40, 50, $TimeShift, $Black);
 
@@ -134 +134 @@
     for($X=1; $X < $Width; $X = $X + 3) imagesetpixel($Image, $X, $Y, $Gray);
     //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
-  } 
+  }
 
-  $TimeShift = AlignTime($StartTime, $MinorTimeMarks) - $StartTime; 
+  $TimeShift = AlignTime($StartTime, $MinorTimeMarks) - $StartTime;
 
   // Zobraz měřítko X
@@ -142 +142 @@
   for($Time = $StartTime; $Time < $EndTime; $Time += $MajorTimeMarks)
   {
-    $X = round(($Time - $StartTime + $TimeShift) / $TimeRange * $Width) % $Width; 
+    $X = round(($Time - $StartTime + $TimeShift) / $TimeRange * $Width) % $Width;
     //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
     if(($MajorTimeMarks > 60*60*24)) $Text = date('j.n.Y', $Time + $TimeShift);