Changeset 505

Timestamp:

Apr 1, 2013, 12:29:37 AM (11 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

Files:

• Common/File.php (deleted)
• Common/Form/Types/File (deleted)
• Common/Global.php (modified) (8 diffs)
• Common/Update.php (modified) (2 diffs)
• Common/Version.php (modified) (1 diff)
• FileDownload.php (deleted)
• Modules/File (added)
• Modules/File/File.php (added)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/FinanceBankAPI/FioDemo.php (modified) (1 diff)
• Modules/FinanceBankAPI/ImportFio.php (modified) (1 diff)
• Modules/NetworkShare (moved) (moved from trunk/share )
• Modules/NetworkShare/NetworkShare.php (added)
• Modules/NetworkShare/SharePage.php (added)
• Modules/NetworkShare/browse.log (deleted)
• Modules/NetworkShare/browse.php (modified) (10 diffs)
• Modules/NetworkShare/index.php (deleted)
• Modules/NetworkShare/online.php (modified) (1 diff)
• Modules/NetworkShare/php.ini (deleted)
• Modules/NetworkShare/playlist.php (modified) (2 diffs)
• Modules/NetworkShare/update.php (modified) (3 diffs)
• admin/Updates.php (modified) (3 diffs)
• finance/manage.php (modified) (1 diff)

trunk/Common/Global.php

@@ -22 +22 @@
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Form/Form.php');
-include_once(dirname(__FILE__).'/File.php');
 include_once(dirname(__FILE__).'/../aktuality/news.php');
 include_once(dirname(__FILE__).'/../finance/bills.php');
@@ -30 +29 @@
   
 // Application modules
+include_once(dirname(__FILE__).'/../Modules/File/File.php');
 include_once(dirname(__FILE__).'/../Modules/Meteostation/Meteostation.php');
 include_once(dirname(__FILE__).'/../Modules/Portal/Portal.php');
@@ -42 +42 @@
 include_once(dirname(__FILE__).'/../Modules/Finance/Finance.php');
 include_once(dirname(__FILE__).'/../Modules/FinanceBankAPI/FinanceBankAPI.php');
+include_once(dirname(__FILE__).'/../Modules/NetworkShare/NetworkShare.php');
 
 class System extends Module
@@ -52 +53 @@
   var $ModuleManager;
   var $PathItems;
-  var $FilesDir;
 
   function __construct()
@@ -60 +60 @@
     $this->Pages = array();
     $this->ModuleManager = new AppModuleManager();
-    $this->FilesDir = '';
     $this->Database = new Database();
     $this->FormManager = new FormManager($this->Database);
@@ -175 +174 @@
   $System = new System();
   $System->Config = $Config;
-  $System->FilesDir = dirname(__FILE__).'/../'.$Config['Web']['UploadFileFolder'].'/';
   $System->Database->Connect($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
   $System->Database->Prefix = $Config['Database']['Prefix'];
@@ -203 +201 @@
   
   // Register new modules
+  $System->ModuleManager->RegisterModule(new ModuleFile($System));
   $System->ModuleManager->RegisterModule(new ModuleMeteostation($System));
   $System->ModuleManager->RegisterModule(new ModulePortal($System));
@@ -215 +214 @@
   $System->ModuleManager->RegisterModule(new ModuleFinance($System));
   $System->ModuleManager->RegisterModule(new ModuleFinanceBankAPI($System));
+  $System->ModuleManager->RegisterModule(new ModuleNetworkShare($System));
   $System->ModuleManager->StartAll();
 }

trunk/Common/Update.php

@@ -176 +176 @@
         {
           $Output .= '<h3>Aktualizace</h3>';
-          $this->UpdateManager->Update();
+          $Output .= $this->UpdateManager->Update();
           $Output .= $this->ControlPanel();
         } else
@@ -183 +183 @@
           $Output .= '<h3>Instalace</h3>';
           $this->UpdateManager->Install();
-          $this->UpdateManager->Update();
+          $Output .= $this->UpdateManager->Update();
           $Output .= $this->ControlPanel();
         } else

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 503; // Subversion revision
-$DatabaseRevision = 502; 
-$ReleaseTime = '2013-03-10';
+$Revision = 505; // Subversion revision
+$DatabaseRevision = 505; 
+$ReleaseTime = '2013-03-31';
 
 ?>

trunk/Modules/Finance/Finance.php

@@ -11 +11 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Base module for finance management';
-    $this->Dependencies = array();
+    $this->Dependencies = array('File');
   }  
 

trunk/Modules/FinanceBankAPI/FioDemo.php

@@ -4 +4 @@
  
 $Fio = new FioAPI();
-$Fio->Token = '';
+$Fio->Token = 'YEEd9LlZ5SJ5VcxFcdbAwCji6UTtxve2ns5sClfCbii8Taq63uP7JNsa7OeN1Oum';
 $Records = $Fio->Import(time() - 3600 * 24 * 31 * 2, time());
 //print_r($Records);

trunk/Modules/FinanceBankAPI/ImportFio.php

@@ -27 +27 @@
       if($Record['Type'] == GPC_TYPE_ITEM)
       {
-        $this->Database->insert('FinanceBankImport', array('Time' => $Record['DueDate'],
-           'BankAccount' => $this->BankAccount, 'Value' => $Record['Value'], 
-            'SpecificSymbol' => $Record['SpecificSymbol'], 'VariableSymbol' => $Record['VariableSymbol'],
-            'ConstantSymbol' => $Record['ConstantSymbol'], 'Currency' => $this->Currency,
-            ));
+        $this->Database->insert('FinanceBankImport', array('Time' => TimeToMysqlDate($Record['DueDate']),
+          'BankAccount' => $this->BankAccount, 'Value' => $Record['Value'], 
+          'SpecificSymbol' => $Record['SpecificSymbol'], 'VariableSymbol' => $Record['VariableSymbol'],
+          'ConstantSymbol' => $Record['ConstantSymbol'], 'Currency' => $this->Currency,
+          ));
         echo('<td>'.$Record['OffsetAccount'].'</td>');
         echo('<td>'.$Record['BankCode'].'</td>');

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");

trunk/admin/Updates.php

@@ -56 +56 @@
   $Manager->Execute("INSERT INTO `ISMenuItem` (`Id` ,`Name` ,`Parent` ,`Table` ,`IconName`) ".
     "VALUES (NULL , 'Sítové služby', '1', 'NetworkConfiguration', '');");
-  $Manager->Execute("INSERT INTO `centrala`.`ISMenuItem` (`Id` ,`Name` ,`Parent` ,`Table` ,`IconName`) ".
+  $Manager->Execute("INSERT INTO `ISMenuItem` (`Id` ,`Name` ,`Parent` ,`Table` ,`IconName`) ".
     "VALUES (NULL , 'Fronta e-mailů', '23', 'EmailQueue', '');");
   $Manager->Execute("CREATE TABLE IF NOT EXISTS `FinanceVAT` (
@@ -154 +154 @@
     "VALUES (NULL , 'Banka', '2', '', '');");
   $Id = $Manager->Database->insert_id;
-  $Manager->Execute("UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Id` =10; ".
-    "UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Id` =48;".
-    "UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Id` =50;");
+  $Manager->Execute("UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Id` =''Bankovní účty'; ".
+    "UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Id` ='Import z účtu';".
+    "UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Name` ='Banky';");
+}
+
+function UpdateTo505($Manager)
+{
+  $Manager->Execute("UPDATE `ISMenuItem` SET `Name` = 'Služby', `Table` = 'Service' WHERE `ISMenuItem`.`Name` ='Tarify';");
+  $Manager->Execute("INSERT INTO `ISMenuItem` (`Id` ,`Name` ,`Parent` ,`Table` ,`IconName`) ".
+      "VALUES (NULL , 'Kategorie služeb', '2', 'ServiceCategory', '');");
+  $Manager->Execute("CREATE TABLE IF NOT EXISTS `NetworkShareItem` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  `Parent` int(11) NOT NULL DEFAULT '0',
+  `Host` int(11) NOT NULL DEFAULT '0',
+  `Size` bigint(20) NOT NULL DEFAULT '0',
+  `Ext` varchar(64) NOT NULL DEFAULT '',
+  `Date` date NOT NULL DEFAULT '0000-00-00',
+  `Type` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Id`),
+  KEY `Parent` (`Parent`),
+  KEY `Search` (`Name`,`Size`),
+  KEY `Name` (`Name`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+  $Manager->Execute("CREATE TABLE IF NOT EXISTS `NetworkShareError` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Host` varchar(16) NOT NULL DEFAULT '',
+  `Message` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
+  
 }
 
@@ -168 +196 @@
   499 => array('Revision' => 500, 'Function' => 'UpdateTo500'),
   500 => array('Revision' => 502, 'Function' => 'UpdateTo502'),
+  502 => array('Revision' => 505, 'Function' => 'UpdateTo505'),
 );
 

trunk/finance/manage.php

@@ -617 +617 @@
       $Bill->System = &$this->System;
       $Bill->InvoiceId = $Row['Id'];
-      $FullFileName = $this->System->FilesDir.$FileName;
+      $FullFileName = $this->System->Modules['File']->FilesDir.$FileName;
       $Bill->SaveToFile($FullFileName);
       $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName)));