Changeset 174 for www

Timestamp:

Mar 24, 2009, 8:07:57 PM (16 years ago)

Author:

george

Message:

• Přesunuto: Složka devel přejmenována na branches.

Location:

www

Files:

• finance/manage.php (modified) (6 diffs)
• system/generators/.htaccess (added)
• system/generators/nat_routerboard.php (modified) (1 diff)
• system/index.php (added)
• temp/transform.php (modified) (1 diff)

www/finance/manage.php

@@ -12 +12 @@
 
     if(array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation']; else $Operation = '';
-        //$Operation = 'ImportOldData';
+          //$Operation = 'ImportOldData';
     switch($Operation)
     {
@@ -21 +21 @@
         $Output = $this->ConvertPDFDataToFiles();
         break;
-      case 'ImportOldData':
-        $Output = $this->ImportOldData();
-        break;
+      //case 'ImportOldData':
+      //  $Output = $this->ImportOldData();
+      //  break;
       case 'NewDeviceForm':
         $Output = $this->ShowNewDeviceForm();
@@ -47 +47 @@
       case 'NewInvoiceForm':
         $Output = $this->ShowNewInvoiceForm();
-        break;
-      case 'ConvertData':
-        $Output = $this->ConvertData();
         break;
       default:
@@ -59 +56 @@
         $Output .= '<a href="?Operation=ConvertPDFToFile">Převést data z databáze do souborů</a><br />';
         $Output .= '<a href="?Operation=Bills">Správa dokladů</a><br />';
-        $Output .= '<a href="?Operation=ConvertData">Převést tabulky</a><br />';
-                $Output .= '<a href="prepocet.php">Přepočet financí</a><br />';
-                $Output .= '<a href="clenove.php">Seznam subjektů</a><br />';
-                $Output .= '<a href="zivnost.php">Živnost</a><br />';
+        //$Output .= '<a href="?Operation=ConvertData">Převést tabulky</a><br />';
+                    $Output .= '<a href="prepocet.php">Přepočet financí</a><br />';
+                    $Output .= '<a href="clenove.php">Seznam subjektů</a><br />';
+                    $Output .= '<a href="zivnost.php">Živnost</a><br />';
     }
     return($Output);
@@ -234 +231 @@
   function ImportOldData()
   {
+    die();
+    
     $Output = '';
     $this->Database->query('TRUNCATE TABLE FinanceCashFlow');
@@ -381 +380 @@
   function ConvertData()
   {
+    die();
+    
     $Finance = $this->System->Modules['Finance'];
           $Output = '';

www/system/generators/nat_routerboard.php

@@ -9 +9 @@
 $Commands[] = '/ip firewall nat { remove [find] }';
 
-$DbResult = $Database->query('SELECT Member.*, Subject.* FROM Member ON Member.Subject = Subject.Id');
+$DbResult = $Database->query('SELECT Member.*, Subject.Name FROM Member JOIN Subject ON Member.Subject = Subject.Id');
 while($Member = $DbResult->fetch_assoc())
 {

www/temp/transform.php

@@ -128 +128 @@
   {
     $Output = '';
+    die();
 
     // Clear previous content