Changeset 505 for trunk/Modules/NetworkShare

Timestamp:

Apr 1, 2013, 12:29:37 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Procházení sdílení přetvořeno na aplikační modul.
• Ukládání a udržování souborů na disku bude nyní samostatný modul. Na tomto modulu zavisí moduly Finance a News.

Location:

trunk/Modules/NetworkShare

Files:

• . (moved) (moved from trunk/share )
• NetworkShare.php (added)
• SharePage.php (added)
• browse.log (deleted)
• browse.php (modified) (10 diffs)
• index.php (deleted)
• online.php (modified) (1 diff)
• php.ini (deleted)
• playlist.php (modified) (2 diffs)
• update.php (modified) (3 diffs)

trunk/Modules/NetworkShare/browse.php

@@ -48 +48 @@
   //$Vlozit = '';
   // Nacti parent ID
-  $DbResult = $Database->query('SELECT LAST_INSERT_ID() FROM items LIMIT 0,1');
+  $DbResult = $Database->query('SELECT LAST_INSERT_ID() FROM NetworkShareItem LIMIT 0,1');
   //echo(DB_NumRows());
   $Row = $DbResult->fetch_array();
@@ -99 +99 @@
       $Nazev = substr($Nazev,0,strrpos($Nazev,'.'));
     } else $Ext = '';
-    //$Vlozit .= "INSERT INTO items (name,size,date,ext,parent,type,host) ".
+    //$Vlozit .= "INSERT INTO NetworkShareItem (name,size,date,ext,parent,type,host) ".
     //"VALUES ('$Nazev','$Velikost',NOW(),'$Ext','$Parent','$Type','$HostID'); ";
     
-    $Database->insert('items', array(
+    $Database->insert('NetworkShareItem', array(
       'name' => $Nazev,
       'size' => $Velikost,
@@ -126 +126 @@
   
   // Aktualizuj velikost
-  //DB_Query("SELECT SUM(size) FROM items WHERE (parent=".$Parent.")");
+  //DB_Query("SELECT SUM(size) FROM NetworkShareItem WHERE (parent=".$Parent.")");
   //$Row = DB_Row();
-  $Database->update('items', 'id='.$Parent, array('size' => $VelikostSlozky));
+  $Database->update('NetworkShareItem', 'id='.$Parent, array('size' => $VelikostSlozky));
   //closedir($Dir);
   return($VelikostSlozky);
@@ -134 +134 @@
 
 // Proskenuj jednotlive sdileni
-$Database->query('DELETE FROM items WHERE host='.$HostID);      // Smaz predchozi polozky
+$Database->query('DELETE FROM NetworkShareItem WHERE host='.$HostID);   // Smaz predchozi polozky
 
 // Zapis nazev pocitace
-$Database->insert('items',array(
+$Database->insert('NetworkShareItem',array(
   'name' => $Host,
   'size' => 0,
@@ -148 +148 @@
 
 // Nacti Parent ID
-$DbResult = $Database->query('SELECT LAST_INSERT_ID() FROM items LIMIT 0,1');
+$DbResult = $Database->query('SELECT LAST_INSERT_ID() FROM NetworkShareItem LIMIT 0,1');
 $Row = $DbResult->fetch_array();
 $Parent = $Row[0];
@@ -170 +170 @@
     {
       // Přidej poloľku sdílení do datanáze
-      $Database->insert('items',array(
+      $Database->insert('NetworkShareItem',array(
         'name' => $Share,
         'size' => 0,
@@ -196 +196 @@
 
 // Aktualizuj velikost dat pocitace
-$DbResult = $Database->query("SELECT SUM(size) FROM items WHERE parent=".$Parent);
-$Row = $DbResult->fetch_array();
-$Database->update('items','id='.$Parent,array('size' => $Row[0]));
+$DbResult = $Database->query("SELECT SUM(size) FROM NetworkShareItem WHERE parent=".$Parent);
+$Row = $DbResult->fetch_array();
+$Database->update('NetworkShareItem','id='.$Parent,array('size' => $Row[0]));
 
 // Zaktivuj strom
@@ -207 +207 @@
 $NewID = $Row['id'];
 $Database->select_db('share');
-$Database->query("DELETE FROM items WHERE host=".$NewID);
-$Database->update('items','host='.$HostID,array('host' => $NewID));
+$Database->query("DELETE FROM NetworkShareItem WHERE host=".$NewID);
+$Database->update('NetworkShareItem','host='.$HostID,array('host' => $NewID));
 echo("OK\n");
 
@@ -219 +219 @@
   
 $Database->select_db('share');
-$DbResult = $Database->query("SELECT SUM(size) FROM items WHERE ((parent=1) AND (host IN (".substr($Vyber,0,-1).')))');
-$Row = $DbResult->fetch_array();
-$Database->update('items','id=1',array('size' => $Row[0]));
+$DbResult = $Database->query("SELECT SUM(size) FROM NetworkShareItem WHERE ((parent=1) AND (host IN (".substr($Vyber,0,-1).')))');
+$Row = $DbResult->fetch_array();
+$Database->update('NetworkShareItem','id=1',array('size' => $Row[0]));
 
 // Zapiš chyby do databáze
 echo("Chyby sdílení...\n");
-$Database->delete('errors', 'host="'.$Host.'"');
+$Database->delete('NetworkShareError', 'host="'.$Host.'"');
 if(is_dir($TempDir.'errors')) 
 {
@@ -244 +244 @@
           {
             $Row = substr($ShareFull.'/'.substr($Row, 39), 0, -1);
-            $Database->insert('errors', array('host' => $Host, 'message' => $Row));
+            $Database->insert('NetworkShareError', array('host' => $Host, 'message' => $Row));
             echo($Row."\n");
           }

trunk/Modules/NetworkShare/online.php

@@ -1 +1 @@
 <?php
-
-include_once('../Common/Global.php');
-
+include('../global.php');
 //$Database->select_db('share');
 echo("\n====================== Kontrola online pocitacu ============================\n\n");

trunk/Modules/NetworkShare/playlist.php

@@ -1 +1 @@
 <?php
-
-include_once('../Common/Global.php');
-
-// Omezení na online/offline uľivatele
+include('../global.php');
+// Omezení na online/offline uµivatele
 
 $DbResult = $Database->query('SELECT id FROM hosts WHERE online=1 AND block=0 AND user>0');
@@ -15 +13 @@
 $Database->select_db('share');
 
-// Maximální vnoření
+// Maximální vnoøení
 $MaxNesting = 20;
 
-// Najde cestu ke keřenu
+// Najde cestu ke keøenu
 function PlnaCesta($Row)
 {

trunk/Modules/NetworkShare/update.php

@@ -1 +1 @@
 <?php
-include('../style.php');
 
 //$Perioda = 3600*3;    // prochazet po tech hodinach
@@ -9 +8 @@
   $Hosts = array();
   $StartTime = GetMicrotime();
-  $DbResult = $Database->query("SELECT * FROM hosts WHERE online=1 AND (block=0 OR name='centrala') AND (name!='GATE') AND user>0");
+  $DbResult = $Database->query("SELECT * FROM NetworkDevice WHERE Online=1 AND (Block=0 OR Name='centrala') AND (Name!='GATE') AND User>0");
   while($Row = $DbResult->fetch_array())
   {
@@ -19 +18 @@
     if($Dnes != $Row['last_share_check']) 
     {
-      echo("Kontroluji ".$Row['name']."...\n");
-      passthru('env browse_host='.$Row['name'].' browse_id='.$HostID.' php -q -c php.ini -f browse.php');
+      echo("Kontroluji ".$Row['Name']."...\n");
+      passthru('env browse_host='.$Row['Name'].' browse_id='.$HostID.' php -q -c php.ini -f browse.php');
     }
-    else echo("Vynechavam ".$Row['name']."...\n");
+    else echo("Vynechavam ".$Row['Name']."...\n");
     // Aktualizuj datum prochazeni   
-    $Database->update('hosts',"name='".$Row['name']."'",array('last_share_check' => $Dnes));
+    $Database->update('Hosts', "name='".$Row['name']."'",array('last_share_check' => $Dnes));
   }
   $Rozdil = GetMicrotime()-$StartTime+10;
   
   // Oprav a zoptimalizuj tabulku
-  $Database->select_db('share');
+  //$Database->select_db('share');
   echo('Opravuji tabulku...');
-  $Database->query('REPAIR TABLE items');
+  $Database->query('REPAIR TABLE NetworkShareItem');
   echo("\nOptimalizuji tabulku...");
-  $Database->query('OPTIMIZE TABLE items');
+  $Database->query('OPTIMIZE TABLE NetworkShareItem');
   
   echo("\nDoba procháení ".date("H:i:s",$Rozdil-3600)."\n\n");