Changeset 46 for trunk

Timestamp:

Jul 27, 2014, 9:05:14 PM (10 years ago)

Author:

chronos

Message:

• Opraveno: SQL aktualizace 40 plus chybějící tabulka MeasureMethod.
• Opraveno: Neplatné ukázkové konfigurační soubory.

Location:

trunk

Files:

• Application/Config/ConfigSample.php (modified) (1 diff)
• Application/CustomOutput.php (modified) (1 diff)
• Application/Model/Measure.php (modified) (27 diffs)
• Application/Model/User.php (modified) (8 diffs)
• Application/Version.php (added)
• Application/View/Graph.php (modified) (12 diffs)
• Application/View/Main.php (modified) (15 diffs)
• Application/View/Page.php (modified) (4 diffs)
• Base/Config/ConfigSample.php (modified) (2 diffs)
• Base/Database.php (modified) (5 diffs)
• Readme.txt (modified) (1 diff)
• SQL/Updates/40.sql (modified) (2 diffs)
• SQL/Updates/46.sql (added)

trunk/Application/Config/ConfigSample.php

@@ -1 +1 @@
 <?php
 
-$Config = array
+$Config['Application'] = array
 (
-  'Database' => array
-  (
-    'Host' => 'localhost',
-    'User' => 'root',
-    'Password' => '',
-    'Database' => 'statistic',
-    'Prefix' => '',
-    'Charset' => 'utf8',
-  ),
   'AddNewValueUrl' => 'http://localhost/dev/statistic/?Module=Measure&amp;Action=Add',
   'Debug' => 0,
-  'Web' => array
-  (
-    'Title' => 'Statistika',
-    'Charset' => 'utf-8',
-    'Admin' => 'Admin',
-    'AdminEmail' => 'admin@domain',
-    'ShowPHPError' => false,
-    'ShowSQLQuery' => false,
-    'ShowSQLError' => false,
-    'ErrorLogFile' => 'php_script_error.log',    
-    'Locale' => 'cz',
-    'UserAnonymousId' => 1,
-    'ShowRuntimeInfo' => false,
-    'FormatHTML' => false,
-  ),
   'DivisionCount' => 500,
   'LevelReducing' => 5,

trunk/Application/CustomOutput.php

@@ -15 +15 @@
     $Tag = new XMLTag('div');
     $Tag->Attributes = array('class' => 'Header');
+    $Tag->SubElements = ' ';
     return($Tag);
   }

trunk/Application/Model/Measure.php

@@ -13 +13 @@
   var $DivisionCount = 500;
   var $ValueTypes = array('Min', 'Avg', 'Max');
-  
+
   function Load($Id)
   {
@@ -24 +24 @@
     } else throw new Exception('Measure not found');
   }
- 
+
   function TimeSegment($Base, $Level)
   {
@@ -50 +50 @@
     $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 2');
     //echo($Database->LastQuery."\n");
-    if($Result->num_rows == 0) 
-    {
-       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 0)); 
+    if($Result->num_rows == 0)
+    {
+       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 0));
        //echo($Database->LastQuery."\n");
     } else if($Result->num_rows == 1)
@@ -64 +64 @@
       //echo($Level.': '.$Time.' - '.MysqlDateTimeToTime($LastValue['Time']).' '.($Time - MysqlDateTimeToTime($LastValue['Time'])).' = '.$Measure['Period']."\n");
       if((($Time - $this->Database->MysqlDateTimeToTime($LastValue['Time'])) < 0.75 * $this->Data['Period']) and ($Level == 0))
-      { 
+      {
         echo('Too short period\n');
       } else
@@ -73 +73 @@
         if(($LastValue['Min'] == $NextToLastValue['Min']) and ($LastValue['Min'] == $Value['Min']) and ($LastValue['Avg'] == $NextToLastValue['Avg']) and ($LastValue['Avg'] == $Value['Avg']) and ($LastValue['Max'] == $NextToLastValue['Max']) and ($LastValue['Max'] == $Value['Max']) and ($LastValue['Continuity'] == 1) and ($Continuity == 1))
         {
-          $this->Database->update($this->Data['DataTable'], '(Time="'.$LastValue['Time'].'") AND (Level='.$Level.') AND (Measure='.$Measure['Id'].')', array('Time' => $this->Database->TimeToMysqlDateTime($Time)));
+          $this->Database->update($this->Data['DataTable'], '(Time="'.$LastValue['Time'].'") AND (Level='.$Level.') AND (Measure='.$this->Data['Id'].')', array('Time' => $this->Database->TimeToMysqlDateTime($Time)));
           //echo($this->Database->LastQuery."\n");
         } else
@@ -79 +79 @@
           $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => $Continuity));
         }
-      }  
+      }
 
       // Update next level
@@ -85 +85 @@
       {
         $Level = $Level + 1;
-        //echo('Level '.$Level."<br>\n");
+        //echo('Level '.$Level."<br/>\n");
         $TimeSegment = $this->TimeSegment($this->Data['Period'], 1);
         $EndTime = $this->AlignTime($Time, $TimeSegment);
@@ -91 +91 @@
         $StartTime = $EndTime - $TimeSegment;
 
-        //echo(" ".$TimeSegment." ".$StartTime.'-'.$EndTime."<br>\n");
+        //echo(" ".$TimeSegment." ".$StartTime.'-'.$EndTime."<br/>\n");
         //flush();
 
@@ -127 +127 @@
   {
     $Y = ($Y2 - $Y1) / ($X2 - $X1) * ($X - $X1) + $Y1;
-    //echo($Y1.'-'.$Y.'-'.$Y2.' '.$X1.'-'.$X.'-'.$X2.'<br>');
+    //echo($Y1.'-'.$Y.'-'.$Y2.' '.$X1.'-'.$X.'-'.$X2.'<br/>');
     return($Y);
   }
@@ -182 +182 @@
             }
           }
-        } 
-        else if($ValueType == 'Min') 
-        {
-          //echo($Values[$I+1]['continuity'].'=='.$Measure['ContinuityEnabled'].'<br>'); 
+        }
+        else if($ValueType == 'Min')
+        {
+          //echo($Values[$I+1]['continuity'].'=='.$Measure['ContinuityEnabled'].'<br/>');
           if($Values[$I + 1]['Continuity'] == $this->Data['ContinuityEnabled'])
           {
@@ -203 +203 @@
       $NewValue[$ValueType] = $NewValue[$ValueType];
     }
-    //if(($RightTime - $LeftTime) > 0) 
-    if($this->Data['Cumulative'] == 0) 
+    //if(($RightTime - $LeftTime) > 0)
+    if($this->Data['Cumulative'] == 0)
     {
       $NewValue['Avg'] = $NewValue['Avg'] / ($RightTime - $LeftTime);
     }
     return($NewValue);
-    //echo($NewValue['avg'].'<br>');
+    //echo($NewValue['avg'].'<br/>');
     //return(array('min' => rand(0,1), 'avg' => $NewValue['avg'], 'max' => rand(0,1)));
   }
@@ -216 +216 @@
   {
     // Get first and last time
-    //echo($Measure['Id'].','.$Level.','.StatTableName($Level)."\n"); 
+    //echo($Measure['Id'].','.$Level.','.StatTableName($Level)."\n");
     $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time LIMIT 1');
     if($Result->num_rows > 0)
@@ -231 +231 @@
     } else $AbsoluteRightTime = 0;
 
-    if($this->Debug) 
-    {
-      echo('AbsoluteLeftTime: '.$AbsoluteLeftTime.'('.$this->Database->TimeToMysqlDateTime($AbsoluteLeftTime).')<br>');
-      echo('AbsoluteRightTime: '.$AbsoluteRightTime.'('.$this->Database->TimeToMysqlDateTime($AbsoluteRightTime).')<br>');
+    if($this->Debug)
+    {
+      echo('AbsoluteLeftTime: '.$AbsoluteLeftTime.'('.$this->Database->TimeToMysqlDateTime($AbsoluteLeftTime).')<br/>');
+      echo('AbsoluteRightTime: '.$AbsoluteRightTime.'('.$this->Database->TimeToMysqlDateTime($AbsoluteRightTime).')<br/>');
     }
     return(array('Left' => $AbsoluteLeftTime, 'Right' => $AbsoluteRightTime));
@@ -240 +240 @@
 
   function LoadRightSideValue($Level, $Time)
-  { 
+  {
     $Result = array();
     $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.$this->Database->TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time ASC LIMIT 1');
@@ -267 +267 @@
   {
     $Result = array();
-    //echo('SELECT * FROM '.StatTableName($Level). ' WHERE '. 'Time < "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY Time DESC LIMIT 1'."<br>\n");
+    //echo('SELECT * FROM '.StatTableName($Level). ' WHERE '. 'Time < "'.TimeToMysqlDateTime($Time).'" AND measure='.$Measure['Id'].' AND level='.$Level.' ORDER BY Time DESC LIMIT 1'."<br/>\n");
     $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time < "'.$this->Database->TimeToMysqlDateTime($Time).'" AND Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 1');
     if($DbResult->num_rows > 0)
@@ -294 +294 @@
   function GetValues($TimeFrom, $TimeTo, $Level)
   {
-    if($this->Debug) echo('TimeFrom: '.$TimeFrom.'('.$this->Database->TimeToMysqlDateTime($TimeFrom).')<br>');
-    if($this->Debug) echo('TimeTo: '.$TimeTo.'('.$this->Database->TimeToMysqlDateTime($TimeTo).')<br>');
+    if($this->Debug) echo('TimeFrom: '.$TimeFrom.'('.$this->Database->TimeToMysqlDateTime($TimeFrom).')<br/>');
+    if($this->Debug) echo('TimeTo: '.$TimeTo.'('.$this->Database->TimeToMysqlDateTime($TimeTo).')<br/>');
 
     //$AbsoluteTime = GetTimeRange($MeasureId);
 
-    //  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and 
+    //  if(($TimeFrom > $AbsoluteLeftTime) and ($TimeStart < $AbsoluteRightTime) and
     //    ($TimeTo > $AbsoluteLeftTime) and ($TimeTo < $AbsoluteRightTime))
     //  {
@@ -319 +319 @@
     //  die();
     if($this->Debug) echo('Item count: '.count($Values));
- 
+
     $Points = array();
     if(count($Values) > 0)
     {
       $Values = array_merge($this->LoadLeftSideValue($Level, $TimeFrom), $Values, $this->LoadRightSideValue($Level, $TimeTo));
-      //echo(count($Values).'<br>');
-      //echo($TimeFrom.','.$TimeTo.'<br>');
-      //echo($Values[0]['Time'].'<br>');
+      //echo(count($Values).'<br/>');
+      //echo($TimeFrom.','.$TimeTo.'<br/>');
+      //echo($Values[0]['Time'].'<br/>');
       $StartIndex = 0;
       $Points = array();
-      //echo($DivisionCount.'<br>');
+      //echo($DivisionCount.'<br/>');
       if($this->Debug) print_r($Values);
       //die();
@@ -335 +335 @@
       {
         $TimeStart = $TimeFrom + (($TimeTo - $TimeFrom) / $this->DivisionCount) * $I;
-        //if($Debug) echo('TimeStart '.$I.': '.$TimeStart.'('.TimeToMysqlDateTime($TimeStart).')<br>');
+        //if($Debug) echo('TimeStart '.$I.': '.$TimeStart.'('.TimeToMysqlDateTime($TimeStart).')<br/>');
         $TimeEnd = $TimeFrom + (($TimeTo - $TimeFrom) / $this->DivisionCount) * ($I + 1);
-        if($this->Debug) echo('TimeEnd '.$I.': '.$TimeEnd.'('.$this->Database->TimeToMysqlDateTime($TimeEnd).')<br>');
-        //echo($TimeStart.','.$TimeEnd.'<br>');
+        if($this->Debug) echo('TimeEnd '.$I.': '.$TimeEnd.'('.$this->Database->TimeToMysqlDateTime($TimeEnd).')<br/>');
+        //echo($TimeStart.','.$TimeEnd.'<br/>');
 
         $EndIndex = $StartIndex;
@@ -344 +344 @@
         //while(($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
         $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
-        //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br>');
+        //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br/>');
         //print_r($SubValues);
         $Points[] = $this->ComputeOneValue($TimeStart, $TimeEnd, $SubValues, $Level);
@@ -356 +356 @@
   function RebuildMeasureCache()
   {
-    echo('Velicina '.$this->Data['Name']."<br>\n");
+    echo('Velicina '.$this->Data['Name']."<br/>\n");
     if($this->Data['Continuity'] == 0) $this->Data['ContinuityEnabled'] = 0;  // non continuous
       else $this->Data['ContinuityEnabled'] = 2;    // continuous graph
@@ -365 +365 @@
     echo("Mazu starou cache (".$Row[0]." polozek)...");
     $this->Database->delete($this->Data['DataTable'], 'Level > 0 AND Measure='.$this->Data['Id']);
-    echo("<br>\n");
+    echo("<br/>\n");
 
     for($Level = 1; $Level <= $this->MaxLevel; $Level++)
     {
-      echo('Uroven '.$Level."<br>\n");
+      echo('Uroven '.$Level."<br/>\n");
       $TimeRange = $this->GetTimeRange($Level - 1);
       //echo($Measure['Id'].','.($Level-1)."\n");
@@ -377 +377 @@
       $EndTime = $this->AlignTime($TimeRange['Right'], $TimeSegment);
       $BurstCount = 500;
-      echo('For 0 to '.round(($EndTime - $StartTime) / $TimeSegment / $BurstCount)."<br>\n");
+      echo('For 0 to '.round(($EndTime - $StartTime) / $TimeSegment / $BurstCount)."<br/>\n");
       for($I = 0; $I <= round(($EndTime - $StartTime) / $TimeSegment / $BurstCount); $I++)
       {
@@ -384 +384 @@
         $EndTime2 = $StartTime + ($I + 1) * $BurstCount * $TimeSegment;
         $Values = array();
-        $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.$this->Database->TimeToMysqlDateTime($StartTime2).'" AND Time < "'.$this->Database->TimeToMysqlDateTime($EndTime2).'" AND Measure='.$Measure['Id'].' AND Level='.($Level - 1).' ORDER BY Time');
+        $DbResult = $this->Database->select($this->Data['DataTable'], '*', 'Time > "'.
+          $this->Database->TimeToMysqlDateTime($StartTime2).'" AND Time < "'.
+          $this->Database->TimeToMysqlDateTime($EndTime2).'" AND Measure='.$this->Data['Id'].
+          ' AND Level='.($Level - 1).' ORDER BY Time');
         while($Row = $DbResult->fetch_assoc())
         {
@@ -393 +396 @@
         if(count($Values) > 0)
         {
-          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $StartTime2), $Values, $this->LoadRightSideValue($Level - 1, $Measure, $EndTime2));
+          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $StartTime2),
+            $Values, $this->LoadRightSideValue($Level - 1, $EndTime2));
 
           $StartIndex = 0;
@@ -405 +409 @@
             while($Values[$EndIndex]['Time'] < $EndTime3) $EndIndex = $EndIndex + 1;
             $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
-            //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br>');
+            //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br/>');
             //print_r($SubValues);
             if(count($SubValues) > 2)
@@ -418 +422 @@
         // Load values in time range
         //array_pop($NextValues);
-      }  
-      echo("Uroven dokoncena<br>\n");
+      }
+      echo("Uroven dokoncena<br/>\n");
       $DbResult = $this->Database->select($this->Data['DataTable'], 'COUNT(*)', 'Level='.$Level.' AND Measure='.$this->Data['Id']);
       $Row = $DbResult->fetch_row();
-      echo("Vloženo ".$Row[0]." položek.<br>\n");
+      echo("Vloženo ".$Row[0]." položek.<br/>\n");
     }
   }
@@ -441 +445 @@
     {
       $Measure->RebuildMeasureCache();
-      echo('Velicina dokoncena<br>');
+      echo('Velicina dokoncena<br/>');
     }
   }

trunk/Application/Model/User.php

@@ -38 +38 @@
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
     $Row = $Query->fetch_assoc();
-    if($Row['User'] != $this->AnonymousUserId) 
+    if($Row['User'] != $this->AnonymousUserId)
     {
       $Query = $this->Database->select('User', '*', 'Id='.$Row['User']);
       $this->Data = $Query->fetch_assoc();
       $Result = $this->System->Translate('UserLogged');
-    } else 
+    } else
     {
       $Query = $this->Database->select('User', '*', 'Id='.$this->AnonymousUserId);
@@ -75 +75 @@
         if($Query->num_rows > 0) $Result = $this->System->Translate('NameUsed');
         else
-        { 
+        {
           $Query = $this->Database->select('User', '*', 'Email = "'.$Email.'"');
           if($Query->num_rows > 0) $Result = $this->System->Translate('EmailUsed');
@@ -82 +82 @@
             $this->Database->insert('User', array('Name' => $Name, 'Login' => $Login, 'Password' => $this->PasswordHash($Login, $Password), 'Email' => $Email, 'RegistrationTime' => 'NOW()', 'Locked' => 1, 'Role' => 2));
             $UserId = $this->Database->insert_id;
-            
+
             $Subject = FromUTF8('Registrace nového účtu', 'iso2');
-            $Message = 'Provedli jste registraci nového účtu na serveru <a href="http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'/">http://'.$Config['System']['Host'].$Config['System']['RootFolder']."/</a>.<br>\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br><br>\n\nVáš účet je: ".$Login."\n<br>Pro dokončení registrace klikněte na tento odkaz: ".'<a href="http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.$this->PasswordHash($Login, $Password).'">http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.$this->PasswordHash($Login, $Password).'</a>.'."\n<br> \n\n<br><br>Na tento email neodpovídejte.";
+            $Message = 'Provedli jste registraci nového účtu na serveru <a href="http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'/">http://'.$Config['System']['Host'].$Config['System']['RootFolder']."/</a>.<br/>\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br/><br/>\n\nVáš účet je: ".$Login."\n<br/>Pro dokončení registrace klikněte na tento odkaz: ".'<a href="http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.$this->PasswordHash($Login, $Password).'">http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'/?Action=UserRegisterConfirm&User='.$UserId.'&H='.$this->PasswordHash($Login, $Password).'</a>.'."\n<br/> \n\n<br/><br/>Na tento email neodpovídejte.";
             $AdditionalHeaders = "To: ".$Name." <".$Email.">\n"."From: ".FromUTF8($Config['System']['Title'], 'iso2')." <noreplay@zdechov.net>\n"."MIME-Version: 1.0\n"."Content-type: text/html; charset=utf-8";
             mail($Email, $Subject, $Message, $AdditionalHeaders);
@@ -121 +121 @@
       if($Row['Password'] != $this->PasswordHash($Login, $Password)) $Result = $this->System->Translate('BadPassword');
       else if($Row['Locked'] == 1) $Result = $this->System->Translate('AccountLocked');
-      else 
-      {
-        $this->Database->update('User', 'Id='.$Row['Id'], array('LastLoginTime' => 'NOW()', 'LastIpAddress' => GetRemoteAddress()));      
+      else
+      {
+        $this->Database->update('User', 'Id='.$Row['Id'], array('LastLoginTime' => 'NOW()', 'LastIpAddress' => GetRemoteAddress()));
         $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $Row['Id']));
         // načtení stavu stromu
@@ -185 +185 @@
     // Check group-operation relation
     $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `GroupOrOperation`="'.$OperationId.'" AND `Type`="Operation"');
-    if($DbResult->num_rows > 0) return(true); 
+    if($DbResult->num_rows > 0) return(true);
     return(false);
   }
@@ -222 +222 @@
 
       $Subject = 'Obnova hesla';
-      $Message = 'Požádali jste o zaslání nového hesla na serveru <a href="http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'">http://'.$Config['System']['Host'].$Config['System']['RootFolder']."</a>.<br />\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br /><br />\n\nVaše nové heslo k účtu ".$Row['Login']." je: ".$NewPassword."\n<br>Pro aktivaci tohoto hesla klikněte na ".'<a href="http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'/?Action=PasswordRecoveryConfirm&User='.$Row['Id'].'&H='.$Row['Password'].'&P='.$NewPassword.'">tento odkaz</a>.'."\n<br /> Po přihlášení si prosím změňte heslo na nové.\n\n<br><br>Na tento email neodpovídejte.";
+      $Message = 'Požádali jste o zaslání nového hesla na serveru <a href="http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'">http://'.$Config['System']['Host'].$Config['System']['RootFolder']."</a>.<br />\nPokud jste tak neučinili, měli by jste tento email ignorovat.<br /><br />\n\nVaše nové heslo k účtu ".$Row['Login']." je: ".$NewPassword."\n<br/>Pro aktivaci tohoto hesla klikněte na ".'<a href="http://'.$Config['System']['Host'].$Config['System']['RootFolder'].'/?Action=PasswordRecoveryConfirm&User='.$Row['Id'].'&H='.$Row['Password'].'&P='.$NewPassword.'">tento odkaz</a>.'."\n<br /> Po přihlášení si prosím změňte heslo na nové.\n\n<br/><br/>Na tento email neodpovídejte.";
       $AdditionalHeaders = "To: ".$Row['Name']." <".$Row['Email'].">\n"."From: ".FromUTF8($Config['System']['Title'], 'iso2')." <noreplay@zdechov.net>\n"."MIME-Version: 1.0\n"."Content-type: text/html; charset=utf-8";
       mail($Row['Email'], $Subject, $Message, $AdditionalHeaders);
@@ -247 +247 @@
     return($Output);
   }
-  
+
   function ServerCount()
   {
@@ -264 +264 @@
       $Total += $Server->RealmCount();
     }
-    return($Total);   
+    return($Total);
   }
 }

trunk/Application/View/Graph.php

@@ -6 +6 @@
 class GraphView extends View
 {
+  var $DefaultWidth;
+  var $DefaultHeight;
+
+  function __construct($System)
+  {
+        parent::__construct($System);
+    $this->DefaultWidth = 800;
+    $this->DefaultHeight = 200;
+  }
+
   function Render()
   {
-    if(array_key_exists('Debug', $_GET)) $Debug = $_GET['Debug']; 
+    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']);
@@ -18 +28 @@
     $TimeDifference = $EndTime - $StartTime;
     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; 
+    $MeasureId = addslashes($_GET['Measure']);
+    if(!array_key_exists('Width', $_GET)) $Width = $this->DefaultWidth;
       else $Width = addslashes($_GET['Width']);
-    if(!array_key_exists('Height', $_GET)) $Height = $DefaultHeight;
+    if(!array_key_exists('Height', $_GET)) $Height = $this->DefaultHeight;
       else $Height = addslashes($_GET['Height']);
     if(!array_key_exists('Differential', $_GET)) $Differential = $this->Config['Application']['DefaultVariables']['Differential'];
@@ -50 +60 @@
     $Points = $Measure->GetValues($StartTime, $EndTime, $Level);
 
-    if($Debug) echo('Points count: '.count($Points).'<br/>'); 
-    //if($Debug) foreach($Points as $Index => $Item) 
-    // echo($Index.': '.$Item['min'].'<br>');
+    if($Debug) echo('Points count: '.count($Points).'<br/>');
+    //if($Debug) foreach($Points as $Index => $Item)
+    // echo($Index.': '.$Item['min'].'<br/>');
 
     // Calculate total max, avg, min value
@@ -73 +83 @@
     $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);
     $PointsMax = array(0, $Height - 1);
     if(($MaxValue - $MinValue) == 0) $MaxValue = $MinValue + 1;
-    { 
+    {
       foreach($Points as $Index => $Item)
       {
@@ -87 +97 @@
         $PointsMax[] = $Index * $Width / $Measure->DivisionCount;
         $PointsMax[] = $Height - 1 - ($Points[$Index]['Max'] - $MinValue) / ($MaxValue - $MinValue) * $Height * $this->Config['Application']['ValueToImageHeigthCoefficient'];
-        //echo($Index.' - '.$Item.' '.$Points[$Index].'<br>');
+        //echo($Index.' - '.$Item.' '.$Points[$Index].'<br/>');
       }
     }
@@ -107 +117 @@
     //array_unshift($Points, 0);
     //$Points[] = $Width - 1;
-    //$Points[] = $Height - 1;
+    //$Points[] = $Height - 1;      echo('sds');
+
 
     //print_r($PointsMax);
- 
+
     // Generate image
-    if(!$Debug) 
+    if(!$Debug)
     {
       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);
@@ -132 +143 @@
       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;
@@ -140 +151 @@
       if($TimeMarksIndex < 2) $TimeMarksIndex = 2;
       $MajorTimeMarks = $TimeMarks[$TimeMarksIndex - 1];
-      $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];  
-   
-      $TimeShift = $Measure->AlignTime($StartTime, $MajorTimeMarks) - $StartTime; 
+      $MinorTimeMarks = $TimeMarks[$TimeMarksIndex - 2];
+
+      $TimeShift = $Measure->AlignTime($StartTime, $MajorTimeMarks) - $StartTime;
       //imagestring($Image, 10, 40, 50, $TimeShift, $Black);
-  
+
       // Zobraz měřítko Y
       $VerticalLinesDistance = $Height / $VerticalLinesCount;
@@ -152 +163 @@
         for($X = 1; $X < $Width; $X = $X + 3) imagesetpixel($Image, $X, $Y, $Gray);
         //imageline($Image, 30, $Y, $Width-1, $Y, IMG_COLOR_STYLED);
-      } 
-
-      $TimeShift = $Measure->AlignTime($StartTime, $MinorTimeMarks) - $StartTime; 
- 
+      }
+
+      $TimeShift = $Measure->AlignTime($StartTime, $MinorTimeMarks) - $StartTime;
+
       // Zobraz měřítko X
       $LastTextEnd = 0;
       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);
@@ -172 +183 @@
         }
         else for($Y = 0; $Y < $Height; $Y = $Y + 3) imagesetpixel($Image, $X, $Y, $Gray);
-      } 
-  
+      }
+
       // Popisky osy Y
       for($I = 1; $I <= $VerticalLinesCount; $I++)
@@ -183 +194 @@
         if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
           imagettftext($Image, $FontSize, 0, 2,  $Y - ($BoundBox[5] - $BoundBox[1]) / 2, $Black, $FontFile, $Text);
-      } 
+      }
       $GenerationTime = floor(($this->System->GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
 
@@ -208 +219 @@
       imagepng($Image);
       imagedestroy($Image);
-    }    
+    }
   }
 }

trunk/Application/View/Main.php

@@ -24 +24 @@
       'caption' => 'Měsíc',
       'period' => 2592000, // 3600 * 24 * 30,
-    ),  
+    ),
     'year' => array(
       'caption' => 'Rok',
@@ -46 +46 @@
     for($I = 1; $I < 32; $I++)
     {
-      if($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = ''; 
+      if($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -54 +54 @@
     $Output .= '<select name="Month">';
     foreach($this->Months as $Index => $Month)
-    { 
+    {
       if($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
       if($Index > 0) $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Month.'</option>';
@@ -63 +63 @@
     $Output .= '<select name="Year">';
     for($I = 2000; $I < 2010; $I++)
-    { 
+    {
       if($I == $TimeParts['year']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
@@ -72 +72 @@
     $Output .= '<select name="Hour">';
     for($I = 0; $I < 24; $I++)
-    { 
+    {
       if($I == $TimeParts['hours']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
@@ -80 +80 @@
     // Minute selection
     $Output .= '<select name="Minute">';
-    for($I = 0; $I < 60; $I++) 
+    for($I = 0; $I < 60; $I++)
     {
       if($I == $TimeParts['minutes']) $Selected = ' selected="1"'; else $Selected = '';
@@ -99 +99 @@
   {
     $Debug = 0;
-
     foreach($this->Config['Application']['DefaultVariables'] as $Index => $Variable)
     {
@@ -112 +111 @@
       $_SESSION['TimeEnd'] = time() - 60;
       $_SESSION['TimeStart'] = $_SESSION['TimeEnd'] - $this->GraphTimeRanges[$_SESSION['Period']]['period'];
-    } 
+    }
 
     $Output = '<div class="Title">Statistiky</div>';
@@ -130 +129 @@
           }
         }
-        break; 
+        break;
       case 'SetTimeNow':
-        if(array_key_exists('Time', $_GET)) 
+        if(array_key_exists('Time', $_GET))
         {
           if(($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
@@ -142 +141 @@
         break;
     }
-    $Output .= '<strong>Časový úsek:</strong><br>';
+    $Output .= '<strong>Časový úsek:</strong><br/>';
     // Show graf time range menu
     if($_SESSION['TimeSpecify'] == 0)
@@ -150 +149 @@
         $Output .= '<a href="?Period='.$Index.'">'.$Item['caption'].'</a>&nbsp;';
       $Output .= '<br/>';
-      $Output .= '<a href="?TimeSpecify=1">Přesnější nastavení...</a><br>';
+      $Output .= '<a href="?TimeSpecify=1">Přesnější nastavení...</a><br/>';
     } else {
       $Output .= '<table cellspacing="0" cellpadding="2" border="0">';
@@ -156 +155 @@
       $Output .= '<tr><td>Konec:</td><td>'.$this->EditTime('TimeEnd').'</td></tr>';
       $Output .= '</table>';
-      $Output .= '<a href="?TimeSpecify=0">Jednoduché nastavení...</a><br>';
+      $Output .= '<a href="?TimeSpecify=0">Jednoduché nastavení...</a><br/>';
     }
     $Output .= '<br/>'.$this->Graph();
@@ -162 +161 @@
     $Output .= '<br/>'.$this->MeasureTable();
     return($Output);
-  }  
-  
+  }
+
   function Graph()
   {
     $Output = '<strong>Graf:</strong><br/>';
-    $Output .= '<img alt="Graf" src="?M=Graph&amp;Measure='.$_SESSION['Measure'].'&amp;From='.$_SESSION['TimeStart'].'&amp;To='.$_SESSION['TimeEnd'].'&amp;Width='.$this->Config['Application']['GraphSize']['Width'].'&amp;Height='.$this->Config['Application']['GraphSize']['Height'].'&amp;Differential='.$_SESSION['Differential'].'" width="'.$this->Config['Application']['GraphSize']['Width'].'" height="'.$this->Config['Application']['GraphSize']['Height'].'"><br>';
-    $Output .= '<a href="?Measure='.$_SESSION['Measure'].'&amp;TimeStart='.$_SESSION['TimeStart'].'&amp;TimeEnd='.$_SESSION['TimeEnd'].'&amp;TimeSpecify=1&amp;Differential='.$_SESSION['Differential'].'">Odkaz na vybraný graf</a><br>';
+    $Output .= '<img alt="Graf" src="?M=Graph&amp;Measure='.$_SESSION['Measure'].
+      '&amp;From='.$_SESSION['TimeStart'].'&amp;To='.$_SESSION['TimeEnd'].'&amp;Width='.
+      $this->Config['Application']['ImageWidth'].'&amp;Height='.$this->Config['Application']['ImageHeight'].
+      '&amp;Differential='.$_SESSION['Differential'].'" width="'.$this->Config['Application']['ImageWidth'].
+      '" height="'.$this->Config['Application']['ImageHeight'].'"/><br/>';
+    $Output .= '<a href="?Measure='.$_SESSION['Measure'].'&amp;TimeStart='.$_SESSION['TimeStart'].'&amp;TimeEnd='.$_SESSION['TimeEnd'].'&amp;TimeSpecify=1&amp;Differential='.$_SESSION['Differential'].'">Odkaz na vybraný graf</a><br/>';
 //print_r(GetValues($Measure, $TimeStart, $TimeEnd));
     return($Output);
   }
-  
+
   function MeasureTable()
   {
@@ -202 +205 @@
         $LastMeasureValue = '&nbsp;';
       }
-      if($Measure['Continuity'] == 1) $Interpolate = 'Ano'; 
+      if($Measure['Continuity'] == 1) $Interpolate = 'Ano';
         else $Interpolate = 'Ne';
       if($Measure['Info'] == '') $Measure['Info'] = '&nbsp;';
@@ -214 +217 @@
     //print_r(gd_info());
     //print_r($_SESSION);
- 
+
     //ShowPage($Output);
     //echo(AddPrefixMultipliers('-0.000000071112345', 'B'));

trunk/Application/View/Page.php

@@ -11 +11 @@
 
   function ShowHeader($Title, $Path)
-  {    
+  {
     $BodyParam = '';
     if($this->Load != '') $BodyParam .= ' onload="'.$this->Load.'"';
     if($this->Unload != '') $BodyParam .= ' onunload="'.$this->Unload.'"';
     $Output = '<?xml version="1.0" encoding="'.$this->Config['Web']['Charset'].'"?>'."\n".
-    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.
-    '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs">'.
+    '<!DOCTYPE html>'.
+    '<html>'.
     '<head><link rel="stylesheet" href="Application/Style/Style.css" type="text/css" media="all" />'.
-    '<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$this->Config['Web']['Charset'].'" />'.
+    '<meta http-equiv="content-type" content="text/html; charset='.$this->Config['Web']['Charset'].'" />'.
     '<script type="text/javascript" src="Application/Style/Global.js"></script>'.
     '<title>'.$this->Config['Web']['Title'].' - '.$Path.'</title>
@@ -25 +25 @@
     return($Output);
   }
-  
+
   function ShowFooter()
   {
     global $ScriptTimeStart;
-    
+
     $Time = round($this->System->GetMicrotime() - $ScriptTimeStart, 2);
     $Output = '<div class="Footer">
@@ -39 +39 @@
     if($this->Config['Web']['ShowRuntimeInfo'] == true) $Output .= '<li>Doba generování: '.$Time.' s / '.ini_get('max_execution_time').' s</li><li>Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B</li>';
   $Output .= '</ul></div></body></html>';
-    return($Output); 
+    return($Output);
   }
-  
+
   function GetOutput($Content)
-  { 
+  {
     global $Config;
-    
+
     $Output = $this->ShowHeader($this->FullTitle, $this->ShortTitle).$Content;
     $Output .= $this->ShowFooter();
@@ -54 +54 @@
 
   function SystemMessage($Text)
-  { 
+  {
     return('<table align="center"><tr><td><div class="SystemMessage"><h3>Systémová zpráva</h3><div>'.$Text.'</div></div</td></tr></table>');
     //ShowFooter();
     //die();
   }
-  
+
   function AccessDenied()
   {
-    return($this->GetOutput($this->SystemMessage($this->System->Translate('AccessDenied'))));  
+    return($this->GetOutput($this->SystemMessage($this->System->Translate('AccessDenied'))));
   }
 }

trunk/Base/Config/ConfigSample.php

@@ -1 +1 @@
 <?php
 
-$Config = array(
+$Config = array
+(
   'Database' => array
   (
@@ -11 +12 @@
     'Charset' => 'utf8',
   ),
-  'Web' => array
+  'System' => array
   (
     'FormatHTML' => false,

trunk/Base/Database.php

@@ -10 +10 @@
   var $ShowSQLQuery = false;
   var $ShowSQLError = false;
-  
+
   function query($Query)
-  {  
+  {
     if($this->ShowSQLQuery)
     {
-      if(isset($_SERVER['REMOTE_ADDR'])) echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>'); 
+      if(isset($_SERVER['REMOTE_ADDR'])) echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; padding-bottom: 3px; padding-top: 3px; font-size: 12px; font-family: Arial;">'.$Query.'</div>');
       else echo($Query."\n");
     }
@@ -25 +25 @@
     }
 
-    return($Result);  
+    return($Result);
   }
 
   function select($Table, $What = '*', $Condition = 1)
   {
-    return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));  
+    return($this->query('SELECT '.$What.' FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition));
   }
 
   function delete($Table, $Condition)
   {
-    $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);  
+    $this->query('DELETE FROM `'.$this->Prefix.$Table.'` WHERE '.$Condition);
   }
-  
+
   function insert($Table, $Data)
   {
@@ -50 +50 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')'); 
+    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
   }
-  
+
   function update($Table, $Condition, $Data)
   {
@@ -61 +61 @@
       $Values .= ', `'.$Key.'`='.$Value;
     }
-    $Values = substr($Values, 2);  
+    $Values = substr($Values, 2);
     $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
   }
-  
+
   function replace($Table, $Data)
   {
@@ -79 +79 @@
     //echo('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES ('.$Values.')<br />');
     $this->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
-    //echo($this->error().'<br>');
+    //echo($this->error().'<br/>');
   }
-  
+
   function charset($Charset)
   {

trunk/Readme.txt

@@ -8 +8 @@
 * Zkopírujte ukázkový soubor Application/Config/ConfigSample.php jako Config.php do stejné složky a upravte v něm nastavení.
 * Vytvořete v databázi uživatele statistic a tabulku statistic a doplňte přístupové údaje do Config.php.
-* Proveďtě import ukázkových dat ze souboru Full.sql s nejvyšším číslem revize umístěným ve složce SQL. Samotná struktura tabulky measure je v Measure.sql a ukázková struktura datové tabulky je v Data.sql.
+* Proveďte import ukázkových dat ze souboru Full.sql s nejvyšším číslem revize umístěným ve složce SQL. Samotná struktura tabulky measure je v Measure.sql a ukázková struktura datové tabulky je v Data.sql.
 * Ve složce measure_scripts je ukázkový soubor monitor.sample.php, který zajišťuje získávání informací o různých veličinách v počítači a jejich plnění do systému. Zkopírujte jej jako monitor.php a upravte dle potřeb.
 

trunk/SQL/Updates/40.sql

@@ -1 @@
-RENAME TABLE `Measure2` TO `Measure` 
+RENAME TABLE `measure` TO `Measure` 
 ALTER TABLE `Measure`  ENGINE = InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
 
@@ -89 +89 @@
 ALTER TABLE `MeasureGroup` CHANGE `Parent` `Parent` INT( 11 ) NULL ;
 
-ALTER TABLE `Measure` ADD `Group` INT NOT NULL AFTER `Id` ;
+ALTER TABLE `Measure` ADD `Group` INT NULL AFTER `Id` ;
 ALTER TABLE `Measure` ADD INDEX ( `Group` ) ;
 ALTER TABLE `Measure` ADD FOREIGN KEY ( `Group` ) REFERENCES `MeasureGroup` ( `Id` );
 ALTER TABLE `Measure` DROP `OldName` ;
-ALTER TABLE `Measure`   DROP `PermissionView`,   DROP `PermissionAdd`;
+ALTER TABLE `Measure` DROP `PermissionView`,   DROP `PermissionAdd`;
 
 ALTER TABLE `Measure` CHANGE `Name` `Name` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ,