Changeset 470

Timestamp:

Dec 30, 2012, 9:40:35 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Vytvořen modul Network a přesunuto do něj zobrazení topologie a seznamu zařízení.
• Upraveno: IS přetvořen na modul.

Location:

trunk

Files:

• .htaccess (added)
• Common/Global.php (modified) (4 diffs)
• Modules/IS (added)
• Modules/IS/IS.php (added)
• Modules/Meteostation/Meteostation.php (modified) (1 diff)
• Modules/Network (added)
• Modules/Network/HostList.php (added)
• Modules/Network/Network.php (added)
• Modules/Network/images (added)
• Modules/Network/images/comp.png (added)
• Modules/Network/images/device.png (added)
• Modules/Network/topologie-gen.php (added)
• Modules/Network/topologie-img.php (added)
• Modules/Network/topologie-img2.php (added)
• Modules/Network/topologie.php (added)
• Modules/Network/topologie.png (added)
• hostlist.php (deleted)
• index.php (modified) (1 diff)
• is (deleted)
• robots.txt (added)

trunk/Common/Global.php

@@ -26 +26 @@
 include_once(dirname(__FILE__).'/../finance/finance.php');
   
+// Application modules
 include_once(dirname(__FILE__).'/../Modules/Meteostation/Meteostation.php');
 include_once(dirname(__FILE__).'/../Modules/Portal/Portal.php');
+include_once(dirname(__FILE__).'/../Modules/IS/IS.php');
+include_once(dirname(__FILE__).'/../Modules/Network/Network.php');
 
 $PrefixMultipliers = array
@@ -124 +127 @@
   {
     /* @var $Page Page */
-    $ClassName = $this->Pages[$Path];
-    $Page = new $ClassName();
-    $Page->System = &$this;
-    $Page->Database = &$this->Database;
-    $Page->GetOutput();
+    if(array_key_exists($Path, $this->Pages)) 
+    {
+      $ClassName = $this->Pages[$Path];
+      $Page = new $ClassName();
+      $Page->System = &$this;
+      $Page->Database = &$this->Database;
+      $Page->GetOutput();
+    } else echo('Page '.$Path.' not found.');
   }
   
@@ -273 +279 @@
   $System->ModuleManager->RegisterModule(new Meteostation($System));
   $System->ModuleManager->RegisterModule(new Portal($System));
+  $System->ModuleManager->RegisterModule(new IS($System));
+  $System->ModuleManager->RegisterModule(new Network($System));
   $System->ModuleManager->StartAll();
 }
@@ -592 +600 @@
 } 
 
+function ProcessURL()
+{
+  if(array_key_exists('REDIRECT_QUERY_STRING', $_SERVER))
+    $PathString = $_SERVER['REDIRECT_QUERY_STRING'];
+    else $PathString = '';
+  if(substr($PathString, -1, 1) == '/') $PathString = substr($PathString, 0, -1);
+  //echo('"'.$QueryString.'"');
+  $PathItems = explode('/', $PathString);
+  if(strpos($_SERVER['REQUEST_URI'], '?') !== false)
+    $_SERVER['QUERY_STRING'] = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?') + 1);
+    else $_SERVER['QUERY_STRING'] = '';    
+  parse_str($_SERVER['QUERY_STRING'], $_GET);
+  return($PathItems);
+}
+
 GlobalInit();
 

trunk/Modules/Meteostation/Meteostation.php

@@ -2 +2 @@
 
 include_once('Common/Image.php');
+include_once('Common/Global.php');
 
 class PageMeteo extends Page

trunk/index.php

@@ -2 +2 @@
 
 include_once('Common/Global.php');
-$System->ShowPage('');
+$Path = ProcessURL();
+$System->ShowPage(implode('/', $Path));
 
 ?>