Changeset 209

Timestamp:

May 6, 2009, 7:37:16 PM (16 years ago)

Author:

george

Message:

• Přidáno: Zobrazení zařízení a spojů pomocí google maps API.
• Smazáno: Staré nepoužité soubory.

Location:

trunk

Files:

• config.sample.php (modified) (1 diff)
• error.php (modified) (1 diff)
• index.php (modified) (1 diff)
• is/calculate_wlan.php (deleted)
• is/tc.php (deleted)
• is/wlan.php (deleted)
• map/ap.jpg (added)
• map/api.js (added)
• map/index.php (modified) (1 diff)
• map/point.gif (added)
• page.php (modified) (2 diffs)
• sql/updates/209.sql (added)
• sunrisechat (added)
• system/bandwidth2.php (deleted)
• system/generators/vpn.php (deleted)
• system/mac_check.php (deleted)

trunk/config.sample.php

@@ -35 +35 @@
       'Count' => 5,
     ),      
+    'GoogleMapsApiKey' => '',
   ),
   'Finance' => array

trunk/error.php

@@ -50 +50 @@
     $err .= "\n";
     //echo('Uvnitř'.$errno);
-    error_log($err, 3, $Config['Web']['ErrorLogFile']);                         // Ulož do chybového protokolu
+    if($Config['Web']['ErrorLogFile'] != '')
+      error_log($err, 3, $Config['Web']['ErrorLogFile']);                               // Ulož do chybového protokolu
           //$err = "Datum: ".$dt."\nHlášení: ".$errmsg."\nSkript: ".$filename."\nŘádek: ".$linenum;
     // mail($Config['Web']['AdminEmail'], $Config['Web']['Title'].' - Chybové hlášení', $err);          // Pošli mi zprávu (pokud je to kritická chyba)

trunk/index.php

@@ -121 +121 @@
     $TotalUser = $DbRow[0];
 
-    $DbResult = $this->Database->query('SELECT COUNT(DISTINCT(Member)) FROM NetworkDevice LEFT JOIN HostType ON HostType.Id = NetworkDevice.Type WHERE HostType.ShowOnline = 1 AND NetworkDevice.Online = 1');
+    $DbResult = $this->Database->query('SELECT COUNT(DISTINCT(Member)) FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDeviceType.ShowOnline = 1 AND NetworkDevice.Online = 1');
     $DbRow = $DbResult->fetch_array();
     $OnlineUser = $DbRow[0];

trunk/map/index.php

@@ -1 +1 @@
 <?php
-include_once('../style.php');
-ShowHeader('Mapa Zdìchova', 'Mapa', 'onload="load()" onunload="GUnload()"'); 
-?>
-   
-    <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAc4xkN_94jkn2t2iN-ZATpxSU_LfcMbvQb2CfcG3YCVl7_yTkCRR3Ey664GMzlmT-I4dZ8VEShvo7Rw"
-      type="text/javascript"></script>
-    
-    <script type="text/javascript">
-    
-    //<![CDATA[
+include_once('../global.php');
 
-    function load() {
-          if (GBrowserIsCompatible()) {
+class NetworkMap extends Page
+{
+  var $FullTitle = 'Mapa sítě';
+  var $ShortTitle = 'Mapa sítě';
+  var $Load = 'initialize()';
+  var $Unload = 'GUnload()';
+
+  function Show()
+  {
+    global $Config;
+    $Output = '<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;sensor=true&amp;key='.$Config['Web']['GoogleMapsApiKey'].'"
+    type="text/javascript">
+  </script>';
+    $Output .= '<script type="text/javascript">
+
+    function initialize() 
+    {
+      if (GBrowserIsCompatible()) 
+      {
+        var map = new GMap2(document.getElementById("map_canvas"));
+        map.setMapType(G_SATELLITE_MAP);
+        map.setCenter(new GLatLng(49.260422, 18.081179), 15);
+        map.setUIToDefault();
+
+// Create our "tiny" marker icon
+var tinyIcon = new GIcon();
+tinyIcon.image = "point.gif";
+tinyIcon.shadow = "http://labs.google.com/ridefinder/images/mm_20_shadow.png";
+tinyIcon.iconSize = new GSize(10, 10);
+tinyIcon.shadowSize = new GSize(10, 10);
+tinyIcon.iconAnchor = new GPoint(5, 5);
+tinyIcon.infoWindowAnchor = new GPoint(5, 1);
+
+// Set up our GMarkerOptions object literal
+markerOptions = { icon:tinyIcon };';
 
 
-      var map = new GMap(document.getElementById("map"));
-      map.addControl(new GLargeMapControl());
-      map.addControl(new GScaleControl());
-       //map.setCenter(new GLatLng(37.4419, -122.1419), 13);
-       
-function initArray() {
-    this.length = initArray.arguments.length;
-    for (var i = 0; i < this.length; i++)
-        this[i] = initArray.arguments[i];
-}
-
-function from10toradix(value,radix){
-    var retval = '';
-    var ConvArray = new initArray(0,1,2,3,4,5,6,7,8,9,'A','B','C','D','E','F');
-    var intnum;
-    var tmpnum;
-    var i = 0;
-
-    intnum = parseInt(value,10);
-    if (isNaN(intnum)){
-        retval = 'NaN';
-    }else{
-        while (intnum > 0.9){
-            i++;
-            tmpnum = intnum;
-            // cancatinate return string with new digit:
-            retval = ConvArray[tmpnum % radix] + retval;  
-            intnum = Math.floor(tmpnum / radix);
-            if (i > 100){
-                // break infinite loops
-                retval = 'NaN';
-                break;
-            }
-        }
+    $DbResult = $this->Database->query('SELECT * FROM NetworkDevice');
+    while($Device = $DbResult->fetch_assoc())
+    {
+      $Output .= 'map.addOverlay(new GMarker(new GLatLng('.$Device['PositionLatitude'].', '.$Device['PositionLongitude'].'), markerOptions)); ';
     }
-    return retval;
-}
-
-      // ============================================================
-      // == We now have to write our own getTileUrl function ========
-      CustomGetTileUrl=function(a,b)
+    
+    $DbResult = $this->Database->query('SELECT * FROM NetworkLink WHERE Interface1 <> 0 AND Interface2 <> 0');
+    while($Link = $DbResult->fetch_assoc())
+    {
+      $DbResult2 = $this->Database->query('SELECT * FROM NetworkDevice WHERE NetworkDevice.Id = (SELECT Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface1'].')');
+      $DbResult3 = $this->Database->query('SELECT * FROM NetworkDevice WHERE NetworkDevice.Id = (SELECT Device FROM NetworkInterface WHERE NetworkInterface.Id = '.$Link['Interface2'].')');
+      if(($DbResult2->num_rows > 0) and ($DbResult3->num_rows > 0))
       {
-        
-        k = Math.pow(2, (b-5)) - 1;
-
-        b = b-2;
-        var c=Math.pow(2, (28-b));
-        var x = from10toradix((a.x+1)* c - 0x1c000000, 16);
-        var y = from10toradix(0x1c000000 - (a.y-k) * c, 16);
-        return "http://mapserver.mapy.cz/ophoto/"+b+"_"+x+"_"+y+"";
+        $Device1 = $DbResult2->fetch_assoc();
+        $Device2 = $DbResult3->fetch_assoc();
+        $Output .= 'map.addOverlay(new GPolyline([new GLatLng('.$Device1['PositionLatitude'].', '.$Device1['PositionLongitude'].'),new GLatLng('.$Device2['PositionLatitude'].', '.$Device2['PositionLongitude'].')], "#FFFFFF", 3, 0.8)); ';
       }
-
-      // ============================================================
-      // ====== Create a single layer "Old OSS" custom maptype ====== 
-      //
-      // == Create the GTileLayer ==
-      var tilelayers = [new GTileLayer(new GCopyrightCollection(""),5,18)];
-      tilelayers[0].getTileUrl = CustomGetTileUrl;
-      tilelayers[0].getCopyright = function(a,b) {
-        return {prefix:"Mapové podklady: ", copyrightTexts:[" GEODIS BRNO, s.r.o."]};
-      }
-      
-      // == Create the GMapType, copying most things from G_SATELLITE_MAP ==
-      var custommap = new GMapType(tilelayers, G_SATELLITE_MAP.getProjection(), "Letecká",{errorMessage:_mMapError});
-      
-      // == Add the maptype to the map ==
-      map.addMapType(custommap);
-
-      // ============================================================
-      // ====== Create a two layer  "OSS Hybrid" layer ==============
-
-      // === It has two layers one is the "Old OSS" map and the other is the top layer from G_HYBRID_MAP
-      var htilelayers = [
-         tilelayers[0],                  // a reference to the tile layer from the first custom map
-         G_HYBRID_MAP.getTileLayers()[1] // a reference to the upper tile layer fo the hybrid map
-      ];
-      
-      var custommap2 = new GMapType(htilelayers, G_SATELLITE_MAP.getProjection(), "Letecká+", {maxResolution:18,minResolution:1,errorMessage:_mMapError});
-
-      // === Add it to the list of map types ===
-      map.addMapType(custommap2);
-
-      // ============================================================
-      map.addControl(new GMapTypeControl());
-      
-      map.setCenter(new GLatLng(47.5172, 14.5019), 5, custommap);
-      
-      GEvent.addListener(map, "moveend", function() {
-        var center = map.getCenter();
-        var b = map.getZoom();
-        var a = map.getCenter();
-        document.getElementById("message").innerHTML = center.toString() + CustomGetTileUrl(a, b) + " "+(b-5);
-      });
-   }
-    
-    // display a warning if the browser was not compatible
-    else {
-      alert("Sorry, the Google Maps API is not compatible with this browser");
     }
-
-    // This Javascript is based on code provided by the
-    // Blackpool Community Church Javascript Team
-    // http://www.commchurch.freeserve.co.uk/   
-    // http://www.econym.demon.co.uk/googlemaps/
-   
+    $Output .= '    
+       }      
     }
-
-    //]]>
-    </script>
-  <div align="center">
-    <div id="map" style="width: 800px; height: 500px"></div>
+    </script>';
+    $Output .= '<div align="center">
+    <div id="map_canvas" style="width: 800px; height: 500px;"></div>
     <div id="message"></div>
     <div id="message2"></div>
-  </div>
+    </div>';
+    return($Output);
+  }
+}
   
-<?php
-  ShowFooter(); 
+$System->AddModule(new NetworkMap());
+$System->Modules['NetworkMap']->GetOutput();
+
 ?>

trunk/page.php

@@ -107 +107 @@
   }
 
-  function ShowHeader($Title, $Path, $BodyParam = '')
+  function ShowHeader($Title, $Path)
   {
     $ScriptName = $_SERVER['SCRIPT_NAME'];
@@ -138 +138 @@
     $Navigation = substr($Navigation, 0, -6);
 
+    $BodyParam = '';
+    if(isset($this->Load)) $BodyParam .= ' onload="'.$this->Load.'"';
+    if(isset($this->Unload)) $BodyParam .= ' onunload="'.$this->Unload.'"';
     $Output = '<?xml version="1.0" encoding="'.$this->System->Config['Web']['Charset'].'"?>'."\n".
     '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.