Changeset 346 for trunk

Timestamp:

Jan 17, 2012, 2:10:21 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Historie chatu přesunuta do samostatného systémového modulu.

Location:

trunk

Files:

• .htaccess (modified) (2 diffs)
• Modules/Chat (moved) (moved from trunk/chat )
• Modules/Chat/Chat.php (copied) (copied from trunk/chat/history.php ) (3 diffs)
• Modules/Chat/history.php (deleted)
• Modules/WebCam/index.php (deleted)
• index.php (modified) (2 diffs)

trunk/.htaccess

@@ -11 +11 @@
 RewriteCond  %{REQUEST_FILENAME}  !-f
 RewriteCond  %{REQUEST_FILENAME}  !-d
-RewriteRule   ^(.*)$ centrala/index.php?page=$1
+RewriteRule   ^(.*)$ centrala/index.php?$1
 
 # Pretty urls 
@@ -17 +17 @@
 RewriteCond  %{REQUEST_FILENAME}  !-f
 RewriteCond  %{REQUEST_FILENAME}  !-d
-RewriteRule   ^(.*)$ index.php?page=$1
+RewriteRule   ^(.*)$ index.php?$1
 
 

trunk/Modules/Chat/Chat.php

@@ -1 +1 @@
 <?php
-
-include_once('../global.php');
-
 
 class ChatHistory extends Page
@@ -18 +15 @@
   {
     global $MonthNames;
-
+    
     if(!$this->System->Models['User']->CheckPermission('Chat', 'Display')) return('Nemáte oprávnění');
 
-    if(array_key_exists('date',$_GET)) $Date = $_GET['date']; else $Date = date('Y-m-d');
-    $DateParts = explode('-',$Date);
+    if(array_key_exists('date', $_GET)) $Date = $_GET['date']; 
+      else $Date = date('Y-m-d');
+    $DateParts = explode('-', $Date);
 
     $DbResult = $this->Database->select('ChatHistory', 'MAX(Time), MIN(Time)');
     $RowTotal = $DbResult->fetch_array();
 
-    $StartDateTimeParts = explode(' ',$RowTotal['MIN(Time)']);
-    $StartDateParts = explode('-',$StartDateTimeParts[0]);
-    $EndDateTimeParts = explode(' ',$RowTotal['MAX(Time)']);
-    $EndDateParts = explode('-',$EndDateTimeParts[0]);
+    $StartDateTimeParts = explode(' ', $RowTotal['MIN(Time)']);
+    $StartDateParts = explode('-', $StartDateTimeParts[0]);
+    $EndDateTimeParts = explode(' ', $RowTotal['MAX(Time)']);
+    $EndDateParts = explode('-', $EndDateTimeParts[0]);
 
     if(!array_key_exists('year', $_SESSION)) $_SESSION['year'] = date('Y', time());
@@ -82 +80 @@
 }
 
-$System->AddModule(new ChatHistory());
-$System->Modules['ChatHistory']->GetOutput();
+class ModuleChat extends Module
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'Chat';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPL';
+    $this->Description = 'Show history of IRC chat and previous SunriseChat';
+    $this->Dependencies = array();
+    $this->Models = array();
+  }
+  
+  function Init()
+  {
+    $this->System->Pages['chat'] = 'ChatHistory';
+  }  
+}
 
 ?>

trunk/index.php

@@ -293 +293 @@
             $Output .= $this->Panel('Přihlášený uživatel', $this->UserPanel());
         } else
-        if($Panel['Module'] == 'Webcam') $Output .= $this->Panel('Kamery', $this->WebcamPanel());
+        if(($Panel['Module'] == 'Webcam') and (array_key_exists('WebCam', $this->System->Modules))) 
+          $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>'));
       }
@@ -316 +317 @@
   } else echo('Stránka nenalezena');
 } else 
-{
+{  
   $System->AddModule(new IndexPage());
   $System->Modules['IndexPage']->GetOutput();