Changeset 506

Timestamp:

Apr 1, 2013, 10:17:42 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Aktuality přepracovány na aplikační modul.

Location:

trunk

Files:

• Common/Global.php (modified) (4 diffs)
• Common/RSS.php (added)
• Modules/File/File.php (modified) (4 diffs)
• Modules/FinanceBankAPI/FioDemo.php (modified) (1 diff)
• Modules/News (moved) (moved from trunk/aktuality )
• Modules/News/News.php (added)
• Modules/News/NewsPage.php (added)
• Modules/News/index.php (deleted)
• Modules/News/news.php (deleted)
• Modules/News/rss.php (deleted)
• Modules/News/rss_generator.php (deleted)
• Modules/News/subscription.php (deleted)
• Modules/News/uploads (deleted)
• Modules/Portal/Portal.php (modified) (4 diffs)

trunk/Common/Global.php

@@ -22 +22 @@
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Form/Form.php');
-include_once(dirname(__FILE__).'/../aktuality/news.php');
 include_once(dirname(__FILE__).'/../finance/bills.php');
 include_once(dirname(__FILE__).'/../finance/finance.php');
@@ -43 +42 @@
 include_once(dirname(__FILE__).'/../Modules/FinanceBankAPI/FinanceBankAPI.php');
 include_once(dirname(__FILE__).'/../Modules/NetworkShare/NetworkShare.php');
+include_once(dirname(__FILE__).'/../Modules/News/News.php');
 
 class System extends Module
@@ -194 +194 @@
   $System->AddModule(new User());
   if(isset($_SERVER['REMOTE_ADDR'])) $System->Modules['User']->Check();
-  $System->AddModule(new News());
   $System->AddModule(new Bill());
   $System->AddModule(new Finance());
@@ -215 +214 @@
   $System->ModuleManager->RegisterModule(new ModuleFinanceBankAPI($System));
   $System->ModuleManager->RegisterModule(new ModuleNetworkShare($System));
+  $System->ModuleManager->RegisterModule(new ModuleNews($System));
   $System->ModuleManager->StartAll();
 }

trunk/Modules/File/File.php

@@ -13 +13 @@
   function Delete($Id)
   {
-    global $Config;
-    
     $DbResult = $this->Database->select('File', 'Name', 'Id='.$Id);
     if($DbResult->num_rows > 0)
@@ -26 +24 @@
   function CreateFromUpload($Name)
   {
-    global $Config;
-    
     // Submited form with file input have to be enctype="multipart/form-data"
     $Result = 0;
@@ -37 +33 @@
         $this->Database->query('INSERT INTO File (`Name`, `Size`) VALUES ("'.$FileName.'", '.filesize($_FILES[$Name]['tmp_name']).')');
         $InsertId = $this->Database->insert_id;
-        if(move_uploaded_file($_FILES[$Name]['tmp_name'], $Config['Web']['UploadFileFolder'].'/'.$InsertId.'_'.$FileName)) $Result = $InsertId;
+        if(move_uploaded_file($_FILES[$Name]['tmp_name'], $this->FilesDir.'/'.$InsertId.'_'.$FileName)) $Result = $InsertId;
       }
     }
@@ -54 +50 @@
   function Download($Id)
   {
-    global $Config;
-    
     $DbResult = $this->Database->select('File', '*', 'Id='.addslashes($Id));
     if($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
-      //Header('Content-Type: '.$this->DetectMimeType($this->FilesDir.'/'.$DbRow['Name']));
-      //Header('Content-Disposition: attachment; filename="'.$DbRow['Name'].'"');
-      print_r($this);
-      echo(file_get_contents($this->FilesDir.'/'.$DbRow['Name']));
+      if(file_exists($this->FilesDir.'/'.$DbRow['Name']))
+      {
+        Header('Content-Type: '.$this->DetectMimeType($this->FilesDir.'/'.$DbRow['Name']));
+        Header('Content-Disposition: attachment; filename="'.$DbRow['Name'].'"');
+        echo(file_get_contents($this->FilesDir.'/'.$DbRow['Name']));
+      } else echo('Soubor nenalezen!');
     } else echo('Soubor nenalezen!');
   }

trunk/Modules/FinanceBankAPI/FioDemo.php

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

trunk/Modules/Portal/Portal.php

@@ -5 +5 @@
 class PagePortal extends Page
 {
-  var $Dependencies = array('News');
   var $FullTitle = 'Zděchovský rozcestník';
   var $ShortTitle = '';
@@ -141 +140 @@
       if($_GET['Action'] == 'CustomizeNewsSave')
       {
-        $Output .= $this->System->Modules['News']->CustomizeSave();
+        $Output .= $this->System->ModuleManager->Modules['News']->CustomizeSave();
       } else
       if($_GET['Action'] == 'LoginForm')
@@ -334 +333 @@
         } else
         if($Panel['Module'] == 'Webcam') $Output .= $this->Panel('Kamery', $this->WebcamPanel());
-        else if($Panel['Module'] == 'NewsGroupList') $Output .= $this->Panel('Aktuality', $this->System->Modules['News']->Show(), array('<a href="?Action=CustomizeNews">Upravit</a>'));
+        else if($Panel['Module'] == 'NewsGroupList') 
+          $Output .= $this->Panel('Aktuality', $this->System->ModuleManager->Modules['News']->Show(), array('<a href="?Action=CustomizeNews">Upravit</a>'));
       }
       $Output .= '</td>';
@@ -353 +353 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Community portal.';
-    $this->Dependencies = array();
+    $this->Dependencies = array('News');
   }