Changeset 7125 for extensions/GMaps/maintain.inc.php

Timestamp:

Oct 7, 2010, 8:04:43 PM (14 years ago)

Author:

grum

Message:

Admin interface + Gallery integration finished

File:

• extensions/GMaps/maintain.inc.php (modified) (3 diffs)

extensions/GMaps/maintain.inc.php

@@ -40 +40 @@
 }
 
-function gpcMsgError(&$errors)
+function gpcMsgError(&$errors, $errorMessage)
 {
-  global $gpcNeeded;
-  $msg=sprintf(l10n('To install this plugin, you need to install Grum Plugin Classes %s before'), GMAPS_GPC_NEEDED);
+  switch($errorMessage)
+  {
+    case 'gpc':
+      $msg=sprintf(l10n('To install this plugin, you need to install Grum Plugin Classes %s before'), GMAPS_GPC_NEEDED);
+      break;
+    case 'amd':
+      $msg=sprintf(l10n('To install this plugin, you need to install Advanced Metadata %s before'), GMAPS_AMD_NEEDED);
+      break;
+  }
+
   if(is_array($errors))
   {
@@ -64 +72 @@
 {
   global $prefixeTable, $gpcInstalled;
-  if($gpcInstalled)
+  if(!$gpcInstalled)
   {
-    $gmaps=new GMaps_Install($prefixeTable, __FILE__);
-    $result=$gmaps->install();
+    gpcMsgError($errors, 'gpc');
+    return(false);
   }
-  else
+  if(GMaps_root::checkAMDActivated()=='none')
   {
-    gpcMsgError($errors);
+    amdMsgError($errors, 'amd');
+    return(false);
   }
+
+  $gmaps=new GMaps_Install($prefixeTable, __FILE__);
+  $result=$gmaps->install();
 }
 
@@ -107 +119 @@
   else
   {
-    gpcMsgError($errors);
+    gpcMsgError($errors, 'gpc');
   }
 }