Changeset 7177 for extensions/GMaps/gmaps_ajax.php

Timestamp:

Oct 13, 2010, 10:08:41 PM (14 years ago)

Author:

grum

Message:

Fix bugs on install process ; add street view control management

File:

• extensions/GMaps/gmaps_ajax.php (modified) (9 diffs)

extensions/GMaps/gmaps_ajax.php

@@ -143 +143 @@
                  isset($_REQUEST['datas']['navigationControl']) &&
                  isset($_REQUEST['datas']['scaleControl']) &&
+                 isset($_REQUEST['datas']['streetViewControl']) &&
                  isset($_REQUEST['datas']['style'])))
             {
@@ -183 +184 @@
               if(!($_REQUEST['datas']['scaleControl']=='y' or
                    $_REQUEST['datas']['scaleControl']=='n')) $_REQUEST['datas']['scaleControl']='y';
+
+              if(!($_REQUEST['datas']['streetViewControl']=='y' or
+                   $_REQUEST['datas']['streetViewControl']=='n')) $_REQUEST['datas']['streetViewControl']='n';
             }
           }
@@ -374 +378 @@
       $datas=Array();
 
-      $sql="SELECT id, name, displayType, sizeMode, width, height, zoomLevel, mapType, mapTypeControl, navigationControl, scaleControl
+      $sql="SELECT id, name, displayType, sizeMode, width, height, zoomLevel, mapType, mapTypeControl, navigationControl, scaleControl, streetViewControl
             FROM ".$this->tables['maps']."
             ORDER BY displayType ASC, name ASC";
@@ -402 +406 @@
           $row['navigationControl']=l10n('gmaps_googleMapNavigationControl_'.$row['navigationControl']);
           $row['scaleControl']=($row['scaleControl']=='y')?l10n('gmaps_display_visible'):l10n('gmaps_display_hidden');
+          $row['streetViewControl']=($row['streetViewControl']=='y')?l10n('gmaps_display_visible'):l10n('gmaps_display_hidden');
           $datas[]=$row;
         }
@@ -437 +442 @@
                 $properties['navigationControl']."', '".
                 $properties['scaleControl']."', '".
+                $properties['streetViewControl']."', '".
                 mysql_escape_string($properties['style'])."');";
         $result=pwg_query($sql);
@@ -447 +453 @@
                 $properties['displayType']."', sizeMode='".
                 $properties['sizeMode']."', width='".
-                $properties['mapId']."', width='".
                 $properties['width']."', height='".
                 $properties['height']."', zoomLevel='".
@@ -454 +459 @@
                 $properties['mapTypeControl']."', navigationControl='".
                 $properties['navigationControl']."', scaleControl='".
-                $properties['scaleControl']."', style='".
+                $properties['scaleControl']."', streetViewControl='".
+                $properties['streetViewControl']."', style='".
                 mysql_escape_string($properties['style'])."'
               WHERE id='$id';";
@@ -483 +489 @@
         'mapTypeControl' => 0,
         'navigationControl' => 0,
-        'scaleControl' => 'y'
+        'scaleControl' => 'y',
+        'streetViewControl' => 'n'
       );
 
-      $sql="SELECT id, displayType, sizeMode, name, width, height, zoomLevel, mapType, mapTypeControl, navigationControl, scaleControl
+      $sql="SELECT id, displayType, sizeMode, name, width, height, zoomLevel, mapType, mapTypeControl, navigationControl, scaleControl, streetViewControl
             FROM ".$this->tables['maps']."
             WHERE id='$id';";
@@ -1006 +1013 @@
       global $prefixeTable, $template, $user, $conf;
 
-      $returned='';
+      $requestId='';
 
       $this->buildMapList($category, 'C');