Changeset 6975

Timestamp:

Sep 20, 2010, 12:42:58 AM (14 years ago)

Author:

grum

Message:

Migration from version 3.1.0 to 3.2.0 implemented

Location:

extensions/GrumPluginClasses

Files:

• classes/CommonPlugin.class.inc.php (modified) (3 diffs)
• classes/GPCRequestBuilder.class.inc.php (modified) (4 diffs)
• gpc_install.class.inc.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (2 diffs)

extensions/GrumPluginClasses/classes/CommonPlugin.class.inc.php

@@ -3 +3 @@
   class name: CommonPlugin
   class version  : 2.2.0
-  plugin version : 3.0.0
+  plugin version : 3.2.0
   date           : 2010-07-28
 
@@ -47 +47 @@
 |         |            | * Update class & function names
 |         |            |
-| 2.2.0   | 2010/07/28 | * Add the loadConfigFromFile function
-|         |            |
+| 2.2.0   | 2010/09/18 | * Add the loadConfigFromFile function
+|         |            | * Change parameters mode for the checkGPCRelease
+|         |            |   function
 |         |            |
 |         |            |
@@ -74 +75 @@
 
   /**
-   * this function return true if class release if greater or equal than needed by the plugin
+   * this function return true if class release if greater or equal than needed
+   * by the plugin
+   *
+   * the function can be called :
+   *   - with 1 String parameter   : checkGPCRelease("3.2.0")
+   *                                 => implemented with the release 3.2.0, this
+   *                                    is the new method recommanded to use
+   *   - with 3 Integer parameters : checkGPCRelease(3,2,0)
+   *                                 => this method is kept for older plugin
+   *                                    compatibility but it's not recommanded
+   *                                    to use it anymore
+   *
+   * @param String $neededRelease : the needed release
+   * @return Boolean : true if the current release is greater or equal than the
+   *                   needed release
+   *
+   * old calling method :
+   * @param Integer $neededRelease : the major release
+   * @param Integer $minor :
+   * @param Integer $minor2 :
+   * @return Boolean;
    */
-  static public function checkGPCRelease($major, $minor, $minor2)
-  {
-    $release = explode(".", GPC_VERSION);
-
-    if(($release[0]>$major) ||
-       ($release[0]==$major)&&($release[1]>$minor) ||
-       ($release[0]==$major)&&($release[1]==$minor)&&($release[2]>=$minor2))
+  static public function checkGPCRelease($neededRelease=0, $minor=0, $minor2=0)
+  {
+    $currentRelease = explode(".", GPC_VERSION);
+
+    if(is_string($neededRelease))
+    {
+      $neededRelease=explode('.', $neededRelease);
+      $major=$neededRelease[0];
+      $minor=$neededRelease[1];
+      $minor2=$neededRelease[2];
+    }
+    else
+    {
+      $major=$neededRelease;
+    }
+
+    if(($currentRelease[0]>$major) ||
+       ($currentRelease[0]==$major)&&($currentRelease[1]>$minor) ||
+       ($currentRelease[0]==$major)&&($currentRelease[1]==$minor)&&($currentRelease[2]>=$minor2))
     {
       return(true);

extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php

@@ -275 +275 @@
    * @return Boolean : true if registering is Ok, otherwise false
    */
-  static public function register($pluginName, $fileName)
+  static public function register($plugin, $fileName)
   {
     $config=Array();
     if(GPCCore::loadConfig(self::$pluginName, $config))
     {
-      $config['registered'][$pluginName]=Array(
-        'name' => $pluginName,
+      $config['registered'][$plugin]=Array(
+        'name' => $plugin,
         'fileName' => $fileName,
         'date' => date("Y-m-d H:i:s"),
@@ -379 +379 @@
   `requestId` char(30) NOT NULL,
   `imageId` mediumint(8) unsigned NOT NULL,
-  PRIMARY KEY  (`request`,`id`)
+  PRIMARY KEY  (`requestId`,`imageId`)
 )
 CHARACTER SET utf8 COLLATE utf8_general_ci",
@@ -406 +406 @@
   `requestId` char(30) NOT NULL,
   `imageId` mediumint(8) unsigned NOT NULL,
-  PRIMARY KEY  (`request`,`id`)
+  PRIMARY KEY  (`requestId`,`imageId`)
 )
 CHARACTER SET utf8 COLLATE utf8_general_ci";
@@ -415 +415 @@
     }
 
-    $tablef=new GPCTables(self::$tables);
+    $tablef=new GPCTables(array(self::$tables['temp']));
 
     if(count($tablesCreate)>0) $tablef->create($tablesCreate);

extensions/GrumPluginClasses/gpc_install.class.inc.php

@@ -64 +64 @@
       if(count($registeredPlugin)>0)
       {
-        return("Some plugins are dependent on Grum Plugin Classes: before uninstall, you must first uninstall the plugins dependent");
+        return(l10n("Some plugins are dependent on Grum Plugin Classes: before uninstall, you must first uninstall the plugins dependent"));
       }
       else
       {
+        $this->deleteConfig();
         $result=GPCRequestBuilder::deleteTables();
         return($result);
@@ -99 +100 @@
       $this->config['installed']=GPC_VERSION2; //update the installed release number
       $this->saveConfig();
+
+      return(true);
     }
 

extensions/GrumPluginClasses/main.inc.php

@@ -104 +104 @@
 
 include_once('gpc_version.inc.php'); // => Don't forget to update this file !!
+include_once(GPC_PATH.'classes/GPCCore.class.inc.php');
 
 global $prefixeTable;
+
+
+
+$config=Array();
+GPCCore::loadConfig('gpc', $config);
+
+if(!isset($config['installed'])) $config['installed']='03.01.00';
+if($config['installed']!=GPC_VERSION2)
+{
+  /* the plugin was updated without being deactivated
+   * deactivate + activate the plugin to process the database upgrade
+   */
+  include(GPC_PATH."gpc_install.class.inc.php");
+  $gpc=new GPC_Install($prefixeTable, __FILE__);
+  $gpc->deactivate();
+  $gpc->activate();
+}
+
 
 if(defined('IN_ADMIN'))

extensions/GrumPluginClasses/maintain.inc.php

@@ -26 +26 @@
 function plugin_activate($plugin_id, $plugin_version, &$errors)
 {
+  global $prefixeTable;
+
   $obj = new GPC_Install($prefixeTable, __FILE__);
   $result=$obj->activate();
@@ -37 +39 @@
 function plugin_deactivate($plugin_id)
 {
+  global $prefixeTable;
+
+  $obj = new GPC_Install($prefixeTable, __FILE__);
+  $result=$obj->deactivate();
 }