Changeset 40

Timestamp:

Feb 1, 2008, 7:57:51 AM (16 years ago)

Author:

george

Message:

Opraveno: Skripty ve složce share.

Location:

www/share

Files:

• browse.php (modified) (12 diffs)
• online.php (modified) (3 diffs)
• update.php (modified) (3 diffs)

www/share/browse.php

@@ -1 +1 @@
 <?php
 include('../style.php');
-include('../global.php');
 $Database->select_db('share');
 $ZanoreniMax = 8;                  // Maximální úroven zanoreni
@@ -8 +7 @@
 $MountDir = '/tmp/browse/host'; // Složka, kde se dočasně připojují síťové disky
 $TempDir = '/tmp/browse/';      // Složka, kde se dočasně připojují síťové disky
-if(!is_dir($TempDir)) mkdir($TempDir,0777);
-if(!is_dir($MountDir)) mkdir($MountDir,0777);
+if(!is_dir($TempDir)) mkdir($TempDir, 0777);
+if(!is_dir($MountDir)) mkdir($MountDir, 0777);
 
 // Nacteni seznamu sdileni
@@ -42 +41 @@
 function Vetev($Cesta,$Zanoreni)
 {
-  global $Citac,$Soubor,$Host,$HostID,$Share,$ZanoreniMax,$Pocet,$Hotovo,$MountDir,$TempDir,$FileSize,$MaxProgress, $Database;
+  global $Citac, $Soubor, $Host, $HostID, $Share, $ZanoreniMax, $Pocet, $Hotovo, $MountDir, $TempDir, $FileSize, $MaxProgress, $Database;
   
   $VelikostSlozky = 0;
@@ -60 +59 @@
     //echo(strlen($Nazev).",");
     array_push($Files,$Nazev);
-  } while(($Nazev!="\n")&&(!feof($Soubor)));
+  } while(($Nazev != "\n") && (!feof($Soubor)));
   array_pop($Files);
   //if(($Pocet-floor($Pocet/10)*10)==9)
-  $Hotovo = floor(ftell($Soubor)/$FileSize*$MaxProgress);
-  if($Hotovo>=$Pocet)
+  $Hotovo = floor(ftell($Soubor) / $FileSize * $MaxProgress);
+  if($Hotovo >= $Pocet)
   {
-    echo(str_repeat('#',$Hotovo-$Pocet));
+    echo(str_repeat('#', $Hotovo-$Pocet));
     $Pocet = $Hotovo;
   }
@@ -75 +74 @@
     $Radek = substr($Radek,0,-1);
     //echo($Radek.",\n");
-    if($Radek[0]=='d') $Type = 2; else $Type = 0;
+    if($Radek[0] == 'd') $Type = 2; else $Type = 0;
     $Prava = substr($Radek,0,strpos($Radek,' '));
     $Radek = ltrim(substr($Radek,strlen($Prava)+1));
@@ -93 +92 @@
     //echo($Date.','.$Time.','.$Radek.' ');
     
-    if((strpos($Nazev,'.')>0)&&($Type!=2))
+    if((strpos($Nazev,'.') > 0) && ($Type != 2))
     {
       $Ext = substr($Nazev,strrpos($Nazev,'.')+1);
@@ -127 +126 @@
   //DB_Query("SELECT SUM(size) FROM items WHERE (parent=".$Parent.")");
   //$Row = DB_Row();
-  $Database->update('items','id='.$Parent,array('size' => $VelikostSlozky));
+  $Database->update('items', 'id='.$Parent, array('size' => $VelikostSlozky));
   //closedir($Dir);
   return($VelikostSlozky);
@@ -133 +132 @@
 
 // Proskenuj jednotlive sdileni
-$Database->uery('DELETE FROM items WHERE host='.$HostID);       // Smaz predchozi polozky
+$Database->query('DELETE FROM items WHERE host='.$HostID);      // Smaz predchozi polozky
 
 // Zapis nazev pocitace
@@ -168 +167 @@
     {
       // Přidej poloľku sdílení do datanáze
-      DB_Insert('items',array(
+      $Database->insert('items',array(
         'name' => $Share,
         'size' => 0,
@@ -200 +199 @@
 // Zaktivuj strom
 echo("Provadim aktivaci nove naskenovaneho stromu...");
-$Database->select('is');
+$Database->select_db('is');
 $DbResult = $Database->query("SELECT id FROM hosts WHERE name='".$Host."'");
 $Row = $DbResult->fetch_array();
 $NewID = $Row['id'];
-$Database->selecet_db('share');
+$Database->select_db('share');
 $Database->query("DELETE FROM items WHERE host=".$NewID);
 $Database->update('items','host='.$HostID,array('host' => $NewID));
@@ -242 +241 @@
           {
             $Row = substr($ShareFull.'/'.substr($Row, 39), 0, -1);
-            DB_Insert('errors', array('host' => $Host, 'message' => $Row));
+            $Database->insert('errors', array('host' => $Host, 'message' => $Row));
             echo($Row."\n");
           }
@@ -252 +251 @@
 }
 
-echo("Doba procházení: ".date("H:i:s",time()-$StartTime-3600)."\n\n");
+echo("Doba procházení: ".date("H:i:s", time() - $StartTime - 3600)."\n\n");
 ?>

www/share/online.php

@@ -1 @@
-<?
-include('../db.php');
-DB_Init('localhost','root','','share');
-echo("\n====================== Kontrolel online pocitacu ============================\n\n");
+<?php
+include('../global.php');
+//$Database->select_db('share');
+echo("\n====================== Kontrola online pocitacu ============================\n\n");
 //while(true)
 {
@@ -70 +70 @@
 
   // Deaktivuj predchozi online pocitace
-  DB_Update('hosts', 1, array('online' => 0));
+  $Database->update('hosts', 1, array('online' => 0));
   
   //print_r($Online);
@@ -76 +76 @@
   foreach($Online as $Item)
   {
-    DB_Query("SELECT * FROM hosts WHERE name='".$Item['host']."'");
-    if(DB_NumRows()>0)
+    $DbResult = $Database->query("SELECT * FROM hosts WHERE name='".$Item['host']."'");
+    if($DbResult->num_rows > 0)
     {
-      DB_Update('hosts',"name='".$Item['host']."'",array( 'IP' => $Item['IP'], 'MAC' => $Item['MAC'], 'online' => 1, 'lastdate' => 'NOW()', 'section' => $Section));
-    } else DB_Insert('hosts',array('name' => $Item['host'], 'IP' => $Item['IP'], 'MAC' => $Item['MAC'], 'online' => 1,'date' => 'NOW()','lastdate' => 'NOW()', 'section' => $Section));
+      $Database->update('hosts',"name='".$Item['host']."'",array( 'IP' => $Item['IP'], 'MAC' => $Item['MAC'], 'online' => 1, 'lastdate' => 'NOW()', 'section' => $Section));
+    } else $Database->insert('hosts',array('name' => $Item['host'], 'IP' => $Item['IP'], 'MAC' => $Item['MAC'], 'online' => 1,'date' => 'NOW()','lastdate' => 'NOW()', 'section' => $Section));
   }
   
   echo("\nSeznam offline pocitacu:\n");
-  DB_Query("SELECT * FROM hosts WHERE online=0");
-  while($Row = DB_Row())
+  $DbResult = $Database->query("SELECT * FROM hosts WHERE online=0");
+  while($Row = $DbResult->fetch_array())
   {
     echo($Row['name'].", ");

www/share/update.php

@@ -1 @@
-<?
+<?php
 include('../style.php');
-include('../db.php');
-DB_Init('localhost','root','','is');
 
-//$Perioda = 3600*3;    // procházet po tøech hodinách
+//$Perioda = 3600*3;    // prochazet po tech hodinach
 
 $Dnes = date('Y-m-d');
@@ -11 +9 @@
   $Hosts = array();
   $StartTime = GetMicrotime();
-  DB_Query("SELECT * FROM hosts WHERE online=1 AND (block=0 OR name='centrala') AND (name!='GATE') AND user>0");
-  while($Row = DB_Row())
+  $DbResult = $Database->query("SELECT * FROM hosts WHERE online=1 AND (block=0 OR name='centrala') AND (name!='GATE') AND user>0");
+  while($Row = $DbResult->fetch_array())
   {
     //echo('Host: '.$Host."...\n");
@@ -24 +22 @@
       passthru('env browse_host='.$Row['name'].' browse_id='.$HostID.' php -q -c php.ini -f browse.php');
     }
-    else echo("Vynechávám ".$Row['name']."...\n");
-    // Aktualizuj datum procházení
-    DB_Save();
-    DB_Update('hosts',"name='".$Row['name']."'",array('last_share_check' => $Dnes));
-    DB_Load();
+    else echo("Vynechavam ".$Row['name']."...\n");
+    // Aktualizuj datum prochazeni   
+    $Database->update('hosts',"name='".$Row['name']."'",array('last_share_check' => $Dnes));
   }
   $Rozdil = GetMicrotime()-$StartTime+10;
   
-  // Oprav a zoptimaizuj tabulku
-  DB_Init('localhost', 'root', '', 'share');
+  // Oprav a zoptimalizuj tabulku
+  $Database->select_db('share');
   echo('Opravuji tabulku...');
-  DB_Query('REPAIR TABLE items');
+  $Database->query('REPAIR TABLE items');
   echo("\nOptimalizuji tabulku...");
-  DB_Query('OPTIMIZE TABLE items');
+  $Database->query('OPTIMIZE TABLE items');
   
-  echo("\nDoba procházení: ".date("H:i:s",$Rozdil-3600)."\n\n");
+  echo("\nDoba procháení ".date("H:i:s",$Rozdil-3600)."\n\n");
   //$Cekat = $Perioda-$Rozdil;
   //echo("Cekam ".date("H:i:s",$Cekat-3600)." minut...\n");