Changeset 336 for trunk

Timestamp:

Dec 30, 2011, 2:22:10 PM (13 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazování chybových hlášení chyb SQL.

Location:

trunk

Files:

• database.php (modified) (1 diff)
• system/generators/netwatch_import.php (modified) (2 diffs)
• system/generators/queue.php (modified) (2 diffs)

trunk/database.php

@@ -63 +63 @@
     } else
     {
-      $this->Error = $this->errorInfo[2];
+      $this->Error = $this->PDO->errorInfo();
+      $this->Error = $this->Error[2];
       if(($this->Error != '') and ($this->ShowSQLError == true)) 
         echo('<div><strong>SQL Error: </strong>'.$this->Error.'<br />'.$Query.'</div>');

trunk/system/generators/netwatch_import.php

@@ -12 +12 @@
   $StartTime = time();
 
-$DbResult3 = $Database->query('SELECT DISTINCT (`DHCP`), * FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`Member` IS NULL)');
-//echo($DbResult3->num_rows);
-while($Subnet = $DbResult3->fetch_assoc())
-{
-  echo($Subnet['AddressRange'].'/'.$Subnet['Mask'].' on router '.$Subnet['DHCP']."\n");
-  $Routerboard = new Routerboard();
-  $Routerboard->UserName = $Config['MainRouter']['UserName'];
-  $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
-  $Routerboard->HostName = $Subnet['DHCP'];
-  $List = $Routerboard->ListGetPrint($Path, array('host', 'status'));
-  foreach($List as $Properties)
+  $DbResult3 = $Database->query('SELECT DHCP, AddressRange, Mask FROM `NetworkSubnet` WHERE (`Configure` = 1) AND (`Member` IS NULL) GROUP BY DHCP');
+  //echo($DbResult3->num_rows);
+  while($Subnet = $DbResult3->fetch_assoc())
   {
-    //echo($Properties['host'].', ');
-    if($Properties['status'] == 'up')
+    echo($Subnet['AddressRange'].'/'.$Subnet['Mask'].' on router '.$Subnet['DHCP']."\n");
+    $Routerboard = new Routerboard();
+    $Routerboard->UserName = $Config['MainRouter']['UserName'];
+    $Routerboard->Timeout = $Config['MainRouter']['ConnectTimeout'];
+    $Routerboard->HostName = $Subnet['DHCP'];
+    $List = $Routerboard->ListGetPrint($Path, array('host', 'status'));
+    foreach($List as $Properties)
     {
-      $Online = 1;
-      $Values = array('Online' => $Online, 'LastOnline' => 'NOW()');
-      //echo($Properties['host']." up\n");
-    } else 
-    {
-      $Online = 0;
-      $Values = array('Online' => $Online);
-      //echo($Properties['host']." down\n");
+      //echo($Properties['host'].', ');
+      if($Properties['status'] == 'up')
+      {
+        $Online = 1;
+        $Values = array('Online' => $Online, 'LastOnline' => 'NOW()');
+        //echo($Properties['host']." up\n");
+      } else 
+      {
+        $Online = 0;
+        $Values = array('Online' => $Online);
+        //echo($Properties['host']." down\n");
+      }
+
+      $DbResult = $Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', $Values);
     }
+  }
 
-    $DbResult = $Database->update('NetworkInterface', '`LocalIP` = "'.$Properties['host'].'"', $Values);
+  // Update device online state
+  $DbResult = $Database->select('NetworkDevice', 'Id', '`Used`=1');
+  while($Device = $DbResult->fetch_assoc())
+  {
+    $DbResult2 = $Database->select('NetworkInterface', 'SUM(`Online`) AS `SumOnline`', '`Device`='.$Device['Id']);
+    $DbRow = $DbResult2->fetch_array();
+    if($DbRow['SumOnline'] > 0) $Online = 1; 
+      else $Online = 0;  
+    $Values = array('Online' => $Online);
+    if($Online == 1) $Values['LastOnline'] = 'NOW()';
+    $Database->update('NetworkDevice', 'Id='.$Device['Id'], $Values);
   }
-}
 
-// Update device online state
-$DbResult = $Database->select('NetworkDevice', 'Id', '`Used`=1');
-while($Device = $DbResult->fetch_assoc())
-{
-  $DbResult2 = $Database->select('NetworkInterface', 'SUM(`Online`) AS `SumOnline`', '`Device`='.$Device['Id']);
-  $DbRow = $DbResult2->fetch_array();
-  if($DbRow['SumOnline'] > 0) $Online = 1; 
-    else $Online = 0;  
-  $Values = array('Online' => $Online);
-  if($Online == 1) $Values['LastOnline'] = 'NOW()';
-  $Database->update('NetworkDevice', 'Id='.$Device['Id'], $Values);
-}
+  // Update interface online statistics
+  $DbResult = $Database->select('NetworkInterface', 'Id', '`Online` = 1');
+  while($Interface = $DbResult->fetch_assoc())
+  {
+    $DbResult2 = $Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+    if($DbResult2->num_rows == 0) $Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"), 1)');          
+      else $Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
+  }
 
   $EndTime = time();
@@ -62 +71 @@
 }
 
-// Update interface online statistics
-$DbResult = $Database->select('NetworkInterface', 'Id', '`Online` = 1');
-while($Interface = $DbResult->fetch_assoc())
-{
-  $DbResult2 = $Database->select('NetworkInterfaceStat', '*', '(`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-  if($DbResult2->num_rows == 0) $Database->query('REPLACE INTO `NetworkInterfaceStat` (`NetworkInterface`, `Time`, `PingCount`) VALUES ("'.$Interface['Id'].'", DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))', '1');          
-    $Database->query('UPDATE `NetworkInterfaceStat` SET `PingCount` = `PingCount` + 1 WHERE (`NetworkInterface`="'.$Interface['Id'].'") AND (`Time` = DATE_FORMAT(NOW(), "%Y-%m-%d %H:00:00"))');
-}
-
 ?>

trunk/system/generators/queue.php

@@ -38 +38 @@
 $InInterface = 'ifb0';
 $InetInterface = $Config['MainRouter']['InetInterface'];
-$FreeInetSpeed = $Finance->Tariffs[6]['SpeedMax'];
+$FreeInetSpeed = $Finance->Tariffs[7]['SpeedMax'];
 
 $ItemsQueue = array();
@@ -116 +116 @@
 }
 
-//print_r($ItemsFirewall);
+//print_r($ItemsQueue);
 $Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true);