Changeset 7398 for extensions/GMaps

Timestamp:

Oct 26, 2010, 10:44:28 AM (13 years ago)

Author:

grum

Message:

Fix bugs on install/update process

Location:

extensions/GMaps

Files:

• admin/plugin_admin.php (modified) (2 diffs)
• gmaps_aip_release.class.inc.php (added)
• language/en_UK/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• maintain.inc.php (modified) (1 diff)

extensions/GMaps/admin/plugin_admin.php

@@ -14 +14 @@
 if (!defined('PHPWG_ROOT_PATH')) { die('Hacking attempt!'); }
 
-include(GMAPS_PATH."gmaps_aip.class.inc.php");
+
 
 global $prefixeTable, $template;
@@ -23 +23 @@
 
 
-$plugin_aip = new GMaps_AIP($prefixeTable, $main_plugin_object->getFileLocation());
+if(CommonPlugin::checkGPCRelease(GMAPS_GPC_NEEDED))
+{
+  $config=Array();
+  GPCCore::loadConfig('gmaps', $config);
+
+
+  if($config['installed']!=GMAPS_VERSION2)
+  {
+    /* the plugin was updated without being deactivated
+     * deactivate + activate the plugin to process the database upgrade
+     */
+    include(GMAPS_PATH."gmaps_install.class.inc.php");
+    $gmaps=new GMaps_Install($prefixeTable, dirname(__FILE__));
+    $gmaps->deactivate();
+    $gmaps->activate();
+    $template->delete_compiled_templates();
+    //$config['newInstall']='n';
+  }
+
+  include(GMAPS_PATH."gmaps_aip.class.inc.php");
+  $plugin_aip = new GMaps_AIP($prefixeTable, $main_plugin_object->getFileLocation());
+}
+else
+{
+  /*
+   * plugin was upgraded, but GPC was not
+   * display a page to inform user to upgrade GPC
+   */
+  include(GMAPS_PATH."gmaps_aip_release.class.inc.php");
+  $plugin_aip = new GMaps_AIPRelease($prefixeTable, $main_plugin_object->getFileLocation());
+}
+
+
+
+
 $plugin_aip->manage();
 

extensions/GMaps/language/en_UK/plugin.lang.php

@@ -2 +2 @@
 
 $lang['To install this plugin, you need to install Grum Plugin Classes %s before']="To install this plugin, you first need to install plugin Grum Plugin Classes %s";
-$lang['To install this plugin, you need to install Advanced Metadata %s before']="To install this plugin, you first need to install plugin Advanced Metadata %s";
+$lang['To install this plugin, you need to install Advanced Metadata %s before']="To install this plugin, you first need to install, activate et configure plugin Advanced Metadata %s";
 $lang['gmaps_amd_warning_inactive']="Warning ! <br><br>Plugin Advanced Metadata %s does not appear to be installed/activated: maps can't be displayed until it is installed and activated.";
 $lang['gmaps_amd_warning_basic']="Warning! <br><br> Plugin Advanced Metadata operates in 'basic' mode: maps linked to the categories can't be displayed with this mode.";
@@ -162 +162 @@
 $lang['gmaps_apply_zoomLevel_max']="Apply a maximum zoom level";
 $lang['gmaps_display_type_cannot_be_changed']="This map is currently associated, the display type can't be modified";
-
+$lang['gmaps_gpc_not_up_to_date']="It is necessary for the plugin that the <i>Grum Plugin Classes</i> version %s is installed.
+Currently, version %s is installed: please proceed with the update version of the plugin <i>Grum Plugin Classes</i>.";
 
 ?>

extensions/GMaps/language/fr_FR/plugin.lang.php

@@ -2 +2 @@
 
 $lang['To install this plugin, you need to install Grum Plugin Classes %s before']="Pour installer ce plugin, vous devez au préalable installer le plugin Grum Plugin Classes %s";
-$lang['To install this plugin, you need to install Advanced Metadata %s before']="Pour installer ce plugin, vous devez au préalable installer le plugin Advanced Metadata %s";
+$lang['To install this plugin, you need to install Advanced Metadata %s before']="Pour installer ce plugin, vous devez au préalable installer, activer et configurer le plugin Advanced Metadata %s";
 $lang['gmaps_amd_warning_inactive']="Attention ! <br><br>Le plugin Advanced Metadata %s ne semble pas être installé/activé : les cartes ne pourront être affichées tant qu'il ne sera pas activé.";
 $lang['gmaps_amd_warning_basic']="Attention ! <br><br>Le plugin Advanced Metadata fonctionne en mode 'basique' : les cartes associées aux catégories ne pourront pas être affichées.";
@@ -173 +173 @@
 $lang['gmaps_apply_zoomLevel_max']="Appliquer un niveau de zoom maximum";
 $lang['gmaps_display_type_cannot_be_changed']="Cette carte faisant l'objet d'associations, la méthode d'affichage ne peut être modifiée";
-
+$lang['gmaps_gpc_not_up_to_date']="Il est nécessaire que le plugin <i>Grum Plugin Classes</i> version %s soit installé.
+Actuellement, la version %s est installée : merci de procéder à la mise à jour de version du plugin <i>Grum Plugin Classes</i>.";
 ?>

extensions/GMaps/maintain.inc.php

@@ -32 +32 @@
 {
   @include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/CommonPlugin.class.inc.php');
-  // need GPC release greater or equal than 3.2.0
+  // need GPC release greater or equal than ...
   if(CommonPlugin::checkGPCRelease(GMAPS_GPC_NEEDED))
   {