Changeset 15345 for extensions/GMaps/gmaps_aip.class.inc.php

Timestamp:

May 27, 2012, 2:04:11 PM (12 years ago)

Author:

grum

Message:

feature:2638 - Compatibility with Piwigo 2.4

File:

• extensions/GMaps/gmaps_aip.class.inc.php (modified) (6 diffs)

extensions/GMaps/gmaps_aip.class.inc.php

@@ -43 +43 @@
       $this->tabsheet->add('amd_warning',
                             l10n('gmaps_warning'),
-                            $this->getAdminLink()."&fGMaps_tabsheet=amd_warning");
+                            $this->getAdminLink()."-amd_warning");
     }
     $this->tabsheet->add('maps',
                           l10n('gmaps_maps'),
-                          $this->getAdminLink()."&fGMaps_tabsheet=maps");
+                          $this->getAdminLink()."-maps");
     $this->tabsheet->add('category_maps',
                           l10n('gmaps_associate_category_maps'),
-                          $this->getAdminLink()."&fGMaps_tabsheet=category_maps");
+                          $this->getAdminLink()."-category_maps");
     $this->tabsheet->add('kml_files',
                           l10n('gmaps_kml_files_management'),
-                          $this->getAdminLink()."&fGMaps_tabsheet=kml_files");
+                          $this->getAdminLink()."-kml_files");
     $this->tabsheet->add('search',
                           l10n('gmaps_search'),
-                          $this->getAdminLink()."&fGMaps_tabsheet=search");
+                          $this->getAdminLink()."-search");
     $this->tabsheet->add('config',
                           l10n('gmaps_config'),
-                          $this->getAdminLink()."&fGMaps_tabsheet=config");
+                          $this->getAdminLink()."-config");
 
 /*    $this->tabsheet->add('help',
                           l10n('gmaps_help'),
-                          $this->getAdminLink()."&fGMaps_tabsheet=help");
+                          $this->getAdminLink()."-help");
 */
   }
@@ -80 +80 @@
     parent::initEvents();
 
-    if($_REQUEST['fGMaps_tabsheet']=='search')
+    if($_GET['tab']=='search')
     {
       // load request builder JS only on the search page
@@ -101 +101 @@
     $template->set_filename('plugin_admin_content', dirname(__FILE__)."/admin/gmaps_admin.tpl");
 
-    switch($_REQUEST['fGMaps_tabsheet'])
+    switch($_GET['tab'])
     {
       case 'amd_warning':
@@ -126 +126 @@
     }
 
-    $this->tabsheet->select($_REQUEST['fGMaps_tabsheet']);
+    $this->tabsheet->select($_GET['tab']);
     $this->tabsheet->assign();
     $selected_tab=$this->tabsheet->get_selected();
@@ -132 +132 @@
 
     $template_plugin["GMAPS_VERSION"] = "<i>".$this->getPluginName()."</i> ".l10n('gmaps_release').GMAPS_VERSION;
-    $template_plugin["GMAPS_PAGE"] = $_REQUEST['fGMaps_tabsheet'];
+    $template_plugin["GMAPS_PAGE"] = $_GET['tab'];
     $template_plugin["GMAPS_TITLE"] = "";
 
@@ -161 +161 @@
     if(!isset($_REQUEST['errcode'])) $_REQUEST['errcode']='';
 
-    if(!isset($_REQUEST['fGMaps_tabsheet']))
+    if(!isset($_GET['tab']))
     {
       if($this->amdState!='advanced' )
       {
-        $_REQUEST['fGMaps_tabsheet']="amd_warning";
+        $_GET['tab']="amd_warning";
       }
       else
       {
-        $_REQUEST['fGMaps_tabsheet']="maps";
-      }
-    }
-
-    if(!($_REQUEST['fGMaps_tabsheet']!="maps" or
-         $_REQUEST['fGMaps_tabsheet']!="category_maps" or
-         $_REQUEST['fGMaps_tabsheet']!="amd_warning" or
-         $_REQUEST['fGMaps_tabsheet']!="kml_files" or
-         $_REQUEST['fGMaps_tabsheet']!="search"
-         //$_REQUEST['fGMaps_tabsheet']!="help"
-         )) $_REQUEST['fGMaps_tabsheet']="maps";
-
-    if($_REQUEST['fGMaps_tabsheet']=="amd_warning" and $this->amdState=='advanced') $_REQUEST['fGMaps_tabsheet']="maps";
+        $_GET['tab']="maps";
+      }
+    }
+
+    if(!($_GET['tab']!="maps" or
+         $_GET['tab']!="category_maps" or
+         $_GET['tab']!="amd_warning" or
+         $_GET['tab']!="kml_files" or
+         $_GET['tab']!="search"
+         //$_GET['tab']!="help"
+         )) $_GET['tab']="maps";
+
+    if($_GET['tab']=="amd_warning" and $this->amdState=='advanced') $_GET['tab']="maps";
   }