Changeset 37 for system/statistic

Timestamp:

Jan 31, 2008, 8:38:47 PM (16 years ago)

Author:

george

Message:

Upraveno: Přepsán přístup k databázi přes třídu mysqli v systémové složce.
Odstraněno: Staré verze souborů a staré nepoužité soubory.

Location:

system

Files:

• . (modified) (1 prop)
• statistic (modified) (1 prop)
• statistic/connections.php (modified) (2 diffs)
• statistic/index.html (deleted)
• statistic/ip_conntrack (deleted)
• statistic/known_mac.php (modified) (3 diffs)
• statistic/php.ini (deleted)
• statistic/test.php (deleted)
• statistic/traffic.php (modified) (7 diffs)
• statistic/traffic.php_2 (deleted)
• statistic/traffic.php_3 (deleted)
• statistic/traffic_1.php (deleted)

system/statistic/connections.php

@@ -1 @@
-<?
-include_once('/a/html/is/db.php');
-DB_Init('localhost','root','','statistic');
+<?php
+include_once('../html/global.php');
+$Database->select('statistic');
 
 while(1)
 {
   $Id = 1;
-  DB_Delete('ip_conntrack', '1');
+  $Database->delete('ip_conntrack', '1');
   $File = fopen('/proc/net/ip_conntrack', 'r');
   while(!feof($File))
@@ -40 +40 @@
       $Size2 = array_shift($Parts);
 
-      DB_Insert('ip_conntrack', array('id' => $Id, 'proto' => $ProtocolType, 'timeout' => $Timeout, 'state' => $TcpState,    'src_addr' => $SourceAddress, 'dst_addr' => $DestinationAddress, 'src_port' => $SourcePort, 'dst_port' => $DestinationPort, 'size' => $Size, 'src_addr2' => $SourceAddress2, 'dst_addr2' => $DestinationAddress2, 'src_port2' => $SourcePort2, 'dst_port2' => $DestinationPort2, 'size2' => $Size2));
+      $Database->insert('ip_conntrack', array('id' => $Id, 'proto' => $ProtocolType, 'timeout' => $Timeout, 'state' => $TcpState,    'src_addr' => $SourceAddress, 'dst_addr' => $DestinationAddress, 'src_port' => $SourcePort, 'dst_port' => $DestinationPort, 'size' => $Size, 'src_addr2' => $SourceAddress2, 'dst_addr2' => $DestinationAddress2, 'src_port2' => $SourcePort2, 'dst_port2' => $DestinationPort2, 'size2' => $Size2));
       $Id = $Id + 1;
     }  

system/statistic/known_mac.php

@@ -1 @@
-<?
-include_once('/a/html/is/db.php');
-DB_Init('localhost','root','','statistic');
+<?php
+include_once('../html/global.php');
+$Database->select_db('statistic');
 
 while(1)
 {
-  DB_Delete('ip_conntrack', '1');
+  $Database->delete('ip_conntrack', '1');
   $File = fopen('/proc/net/arp', 'r');
   fgets($File);  // Title row
@@ -20 +20 @@
       if($Mac != '00:00:00:00:00:00')
       {
-        DB_Select('known_mac', '*', 'ip="'.$Ip.'" AND mac="'.$Mac.'" AND interface="'.$Interface.'"');
-        if(DB_NumRows() == 0) DB_Insert('known_mac', array('ip' => $Ip, 'mac' => $Mac, 'interface' => $Interface, 'first_time' => 'NOW()', 'last_time' => 'NOW()'));
-          else DB_Update('known_mac', 'ip="'.$Ip.'" AND mac="'.$Mac.'" AND interface="'.$Interface.'"', array('last_time' => 'NOW()'));
+        $DbResult = $Database->select('known_mac', '*', 'ip="'.$Ip.'" AND mac="'.$Mac.'" AND interface="'.$Interface.'"');
+        if($DbResult->num_rows == 0) $Database->insert('known_mac', array('ip' => $Ip, 'mac' => $Mac, 'interface' => $Interface, 'first_time' => 'NOW()', 'last_time' => 'NOW()'));
+          else $Database->update('known_mac', 'ip="'.$Ip.'" AND mac="'.$Mac.'" AND interface="'.$Interface.'"', array('last_time' => 'NOW()'));
       }
     }  
@@ -28 +28 @@
   }
   fclose($File);
-  DB_Query('OPTIMIZE TABLE known_mac');
+  $Database->query('OPTIMIZE TABLE known_mac');
   Sleep(50);  // ARP cache timeout = 60 seconds
 }

system/statistic/traffic.php

@@ -1 @@
-<?
-
+<?php
+
+include('../../html/global.php');
+$Database->select_db('statistic');
+$Config['Web']['ShowError'] = 1;
 echo("\nSledovac prenesenych dat\n");
-include('/a/html/is/db.php');
-DB_Init('localhost','root','','statistic');
 $ERR = 0;
 
 function CpuUsage()
 {  
-  global $cpuIDLEprev, $cpuSYSTprev, $cpuUSERprev;
+  global $cpuIDLEprev, $cpuSYSTprev, $cpuUSERprev, $Database;
+
   // get processor usage seconds for pct stats ###
   $File = fopen('/proc/stat', 'r');
@@ -88 +90 @@
 function Resetuj()
 {
-  global $ERR, $ID;
+  global $ERR, $ID, $Database;
+
   echo("Error ".$ERR.". - restartuji pripojeni...");
   if($ERR == 0)
   {
-    DB_Insert('failure', array('time' => 'NOW()', 'attempt' => 0));
-    DB_Query('SELECT LAST_INSERT_ID() FROM failure LIMIT 0,1');
-    $Row = DB_Row();    
+    $Database->insert('failure', array('time' => 'NOW()', 'attempt' => 0));
+    $DbResult = $Database->query('SELECT LAST_INSERT_ID() FROM failure LIMIT 0,1');
+    $Row = $DbResult->fetch_array();    
     $ID = $Row[0];
   }
-  else DB_Update('failure', 'id='.$ID,array('attempt' => $ERR));
+  else $Database->update('failure', 'id='.$ID,array('attempt' => $ERR));
   // echo($ID);
 //  if($ERR == 5) exec('killall -TERM pppd',$Output);
@@ -123 +126 @@
   sleep(60);
   $NetworkStat = GetNetworkStat();
-  // zji¹tìní vytí¾ení procesoru
+  // zjit��vyt�n�procesoru
   $CPU = CpuUsage();
   //$loadavg = fopen('/proc/loadavg','r');
@@ -129 +132 @@
   //$CPU = $data[0];
   //fclose($loadavg);
-  // zji¹tìní poètu zapnutých poèítaèù 
+  // zjit��po�u zapnutch po�ta� 
  
-  DB_Init('localhost','root','','is');
-  DB_Query('SELECT COUNT(*) FROM hosts WHERE online=1 AND show_online=1');
-  $Row = DB_Row();
+  $Database->select_db('is');
+  $DbResult = $Database->query('SELECT COUNT(*) FROM hosts WHERE online=1 AND show_online=1');
+  $Row = $DbResult->fetch_array();
   $OnlineHosts = $Row[0];
 
-  DB_Query('SELECT COUNT(*) FROM users WHERE role=0');
-  $Row = DB_Row();
+  $DbResult = $Database->query('SELECT COUNT(*) FROM users WHERE role=0');
+  $Row = $DbResult->fetch_array();
   $MembersCount = $Row[0];
 
-  DB_Init('localhost','root','','statistic');
+  $Database->select_db('statistic');
   $HDD = round(disk_free_space('/')/1024);
   $HDD2 = round(disk_free_space('/mnt/sda1')/1024);
  
-  // Naètení teploty
+  // Na�en�teploty
   fseek($TemperatureFile,0);
   $Temperature = fgets($TemperatureFile, 1000);
@@ -153 +156 @@
   $Ping = Ping();  
 
+/*
   file_get_contents('http://localhost/statistic/new/add.php?MeasureId=1&Value='.$NetworkStat['eth1']['down_avg']);
   file_get_contents('http://localhost/statistic/new/add.php?MeasureId=2&Value='.$NetworkStat['eth1']['up_avg']);
@@ -171 +175 @@
   file_get_contents('http://localhost/statistic/new/add.php?MeasureId=20&Value='.$NetworkStat['eth2']['down_avg']);
   echo(file_get_contents('http://localhost/statistic/new/add.php?MeasureId=21&Value='.$NetworkStat['eth2']['up_avg']));
+*/
   
 //  echo('Down: '.$NetworkStat['eth1']['down_avg'].'  Up: '.$NetworkStat['eth1']['up_avg'].'  CPU: '.$CPU.'  HDD: '.$HDD.'  Hosts: '.$OnlineHosts.' Temperature: '.$Temperature.' GameServerCpu: '.$GameServerCpu.' WowPlayerCount2: '.$WowPlayerCount2.' Game-serverUsedMemory: '.$Centrala2UsedMemory.' Ping: '.$Ping);
@@ -185 +190 @@
     'wlan2_down' => $NetworkStat['wlan2']['down_avg'], 'wlan2_up' => $NetworkStat['wlan2']['up_avg'],
     'eth2_down' => $NetworkStat['eth2']['down_avg'], 'eth2_up' => $NetworkStat['eth2']['up_avg']);
-  DB_Insert('traffic', $NewItem);
+  $Database->insert('traffic', $NewItem);
   //echo(serialize($NewItem)."\n");
     //$LevelDivider = 10;