Changeset 345 for trunk

Timestamp:

Jan 17, 2012, 1:49:47 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Zobrazování webkamer přesunuto do samostatného systémového modulu.

Location:

trunk

Files:

• Modules/WebCam (added)
• Modules/WebCam/WebCam.php (added)
• Modules/WebCam/index.php (added)
• Modules/WebCam/vlc (added)
• Modules/WebCam/vlc/snapshot.sh (added)
• Modules/WebCam/vlc/stream.sh (added)
• Modules/WebCam/webcam_refresh.php (added)
• global.php (modified) (2 diffs)
• index.php (modified) (2 diffs)
• webcam (deleted)

trunk/global.php

@@ -15 +15 @@
 include_once('Modules/log.php');
 include_once('aktuality/news.php');
-include_once('webcam/webcam.php');
 include_once('finance/bills.php');
 include_once('finance/finance.php');
@@ -207 +206 @@
   $System = new System($Database);
   $System->Config = &$Config;
+  //$System->ReloadList();
   //$System->Install();
-  //$System->ReloadList();
   $System->Init();
   if(isset($_SERVER['REMOTE_ADDR'])) $System->Models['User']->Check();
   $System->AddModule(new Log());
   $System->AddModule(new News());
-  $System->AddModule(new Webcam());
   $System->AddModule(new Bill());
   $System->AddModule(new Finance());

trunk/index.php

@@ -97 +97 @@
   function WebcamPanel()
   {
-    $Output = $this->System->Modules['Webcam']->ShowImage();
+    $Output = $this->System->Modules['WebCam']->ShowImage();
     return($Output);
   }
@@ -306 +306 @@
 {  
   $Page = $_GET['page'];
+  if(substr($Page, -1) == '/') $Page = substr($Page, 0, -1);
   if(array_key_exists($Page, $System->Pages)) 
   {