Changeset 7842 for trunk/src

Timestamp:

Apr 18, 2010, 10:56:54 PM (15 years ago)

Author:

Pieter Naber

Message:

Doesn't work offline. Can PHP function simplexml_load_file() deal with the header("Location: ...") redirect of kml.php?

Location:

trunk/src

Files:

• config.php (modified) (4 diffs)
• inc/LogHandler.class.php (modified) (1 diff)
• kml/nodemap-1271516700.kml (added)
• kml/nodemap-1271517300.kml (added)
• kml/nodemap-1271521500.kml (added)
• kml/nodemap-1271522400.kml (added)
• kml/nodemap-1271522700.kml (added)
• kml/nodemap-1271630400.kml (added)
• kml/nodemap-1271630700.kml (added)
• map/inc/kmlHandler.php (modified) (1 diff)

trunk/src/config.php

@@ -29 +29 @@
  */
 $config['root']                         = dirname(__FILE__);
-$config['root_class']           = $config['root'] . '/inc/';
+$config['url']                          = $_SERVER['HTTP_HOST'];
+$config['uri']                          = $_SERVER['REQUEST_URI'];
 $config['file_init']            = 'init.php';
 
@@ -35 +36 @@
  * Placemark settings. Which icons do you want to use
  */
-$config['node_green']   = 'http://dellphi.wirelessleiden.nl/nodemap/img/sleutelGroen.png';
-$config['node_orange']  = 'http://dellphi.wirelessleiden.nl/nodemap/img/sleutelOranje.png';
-$config['node_red']             = 'http://dellphi.wirelessleiden.nl/nodemap/img/sleutelRood.png';
+$config['node_green']   = 'http://' . $config['url'] . $config['uri'] . '/img/sleutelGroen.png';
+$config['node_orange']  = 'http://' . $config['url'] . $config['uri'] . '/img/sleutelOranje.png';
+$config['node_red']             = 'http://' . $config['url'] . $config['uri'] . '/img/sleutelRood.png';
 $config['line_black']   = '#66000000';
 
@@ -45 +46 @@
  */
 $config['require']                      = array();
-$config['require'][]            = $config['root_class'] . 'ErrorHandler.php';
-$config['require'][]            = $config['root_class'] . 'LogHandler.class.php';
-$config['require'][]            = $config['root_class'] . 'FileHandler.class.php';
-$config['require'][]            = $config['root_class'] . 'KMLFile.class.php';
-$config['require'][]            = $config['root_class'] . 'KMLNode.class.php';
-$config['require'][]            = $config['root_class'] . 'KMLLine.class.php';
-$config['require'][]            = $config['root_class'] . 'Network.class.php';
-$config['require'][]            = $config['root_class'] . 'NetworkList.class.php';
+$config['require'][]            = $config['root'] . '/inc/ErrorHandler.php';
+$config['require'][]            = $config['root'] . '/inc/LogHandler.class.php';
+$config['require'][]            = $config['root'] . '/inc/FileHandler.class.php';
+$config['require'][]            = $config['root'] . '/inc/KMLFile.class.php';
+$config['require'][]            = $config['root'] . '/inc/KMLNode.class.php';
+$config['require'][]            = $config['root'] . '/inc/KMLLine.class.php';
+$config['require'][]            = $config['root'] . '/inc/Network.class.php';
+$config['require'][]            = $config['root'] . '/inc/NetworkList.class.php';
 
 $config['googlekey']            = array();
@@ -62 +63 @@
  */
 $time = mktime() - (mktime() % 300);
-$config['kml_file']                     = 'kml.php?time=' . $time;
+$config['kml_file']                     = 'http://' . $config['url'] . $config['uri'] . '/kml.php?time=' . $time;
 // Should be something like:
 // $config['kml_file']          = $config['root'] . '/kml.php?time=%TIMESTAMP%';

trunk/src/inc/LogHandler.class.php

@@ -118 +118 @@
                 if ($logno <= LOG_LEVEL_MAIL) {
                         global $config;
-                        mail($config['mail'], 'Nodemap error', $errorString);
+                        @mail($config['mail'], 'Nodemap error', $errorString);
                 }
         }

trunk/src/map/inc/kmlHandler.php

@@ -4 +4 @@
 {
         //Check if the file exists, if it does we load it. If it doesn't we exit and return an error message
-        if (file_exists($file)) 
-        {
-                $xml = simplexml_load_file($file);
-        } 
-        else 
-        {
-                exit('Failed to open'.$file);
+        try {
+                $xml = simplexml_load_file(rawurlencode($file));
+        } catch (Exception $e) {
+                trigger_error(SYSLOG_CRIT, 'Failed to open KML file: ' . $file, __FILE__, __LINE__);
         }