Changeset 246 for trunk

Timestamp:

06/24/2011 09:45:59 AM (11 months ago)

Author:

sque

Message:

Make google api key optional ( Closes #148 ) and improve api key selection algorithm

Location:

trunk

Files:

• config-sample/config.php (modified) (1 diff)
• globals/functions.php (modified) (2 diffs)
• includes/pages/gmap/gmap_fullmap.php (modified) (2 diffs)
• includes/pages/gmap/gmap_js.php (modified) (2 diffs)
• includes/pages/gmap/gmap_pickup_js.php (modified) (1 diff)

trunk/config-sample/config.php

@@ -92 +92 @@
                         'default' => 'hybrid'
                         ),
-                'api' => '2.128e',
+                'api' => '3.5',
                 'keys' => array( // Domains must be as in $_SERVER['SERVER_NAME'] variable
                         // 'server.example.org/path' => 'example_key'

trunk/globals/functions.php

@@ -5 +5 @@
  * Copyright (C) 2005 Nikolaos Nikalexis <winner@cube.gr>
  * Copyright (C) 2009-2010 Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
+ * Copyright (C) 2011 K. Paliouras <squarious@gmail.com>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -324 +325 @@
 function include_gmap($javascript) {
         global $main, $vars, $lang;
-        $dirname = dirname($_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF']);
-        $gmap_key = '' ;
-        if (isset($vars['gmap']['keys'][$dirname])) {
-                $gmap_key = $vars['gmap']['keys'][$dirname];
-        }
-        if (isset($vars['gmap']['keys'][$dirname."/"]) && $gmap_key == '') {
-                $gmap_key = $vars['gmap']['keys'][$dirname."/"];
-        }
-        if (isset($vars['gmap']['keys']["http://".$dirname]) && $gmap_key == '') {
-                $gmap_key = $vars['gmap']['keys']["http://".$dirname];
-        }
-        if (isset($vars['gmap']['keys']["http://".$dirname."/"]) && $gmap_key == '') {
-                $gmap_key = $vars['gmap']['keys']["http://".$dirname."/"];
-        }
-        if ($gmap_key == '') return FALSE;
-        
-        $main->html->head->add_script("text/javascript", htmlspecialchars("http://".$vars['gmap']['server']."/maps?file=api&v=".$vars['gmap']['api']."&key=".$gmap_key."&hl=".$lang["iso639"]));
+        
+        
+        $serve_host = strtolower($_SERVER['SERVER_NAME']);
+        $serve_path = $serve_host.$_SERVER['PHP_SELF'];
+        $gmap_key = false;
+        
+        // Loop around all keys to find the most appropriate    
+        foreach($vars['gmap']['keys'] as $key_path => $key) {
+                $key_path = strtolower($key_path);
+                
+                // remove prefixed http://
+                if (substr($key_path, 0, 7) == 'http://') {
+                        $path = substr($key_path, 7);
+                } else if (substr($key_path, 0, 8) == 'https://') {
+                        $path = substr($key_path, 8);
+                }
+                
+                
+                // If host name is not the same then false
+                if (substr($key_path, 0, strlen($serve_host)) != $serve_host)
+                        continue;
+
+                // Compare if server_path includes $key_path 
+                if (substr($serve_path, 0, strlen($key_path)) != $key_path)
+                        continue;
+                
+                $gmap_key = $key;
+        }       
+        $main->html->head->add_script("text/javascript",
+                htmlspecialchars("http://{$vars['gmap']['server']}/maps?" .
+                        http_build_query(array(
+                                'file' => 'api',
+                                'v' => $vars['gmap']['api'],
+                                'key' => $gmap_key,
+                                'hl=' => $lang["iso639"])
+                        )
+                )
+        );
         $main->html->head->add_script("text/javascript", $javascript);
         $main->html->head->add_extra(

trunk/includes/pages/gmap/gmap_fullmap.php

@@ -25 +25 @@
         var $tpl;
         
-        function gmap() {
-
-        }
-        
         function output() {
                 global $main, $vars;
@@ -37 +33 @@
 
 }
-
-?>

trunk/includes/pages/gmap/gmap_js.php

@@ -24 +24 @@
         var $tpl;
 
-        function gmap_js() {
-                
-        }
-        
         function output() {
                 global $db, $lang, $vars;
@@ -80 +76 @@
 }
 
-?>

trunk/includes/pages/gmap/gmap_pickup_js.php

@@ -57 +57 @@
 }
 
-?>