Changeset 29779

Timestamp:

Sep 25, 2014, 11:25:24 AM (10 years ago)

Author:

mistic100

Message:

final fix for plugins update ?

• plugins.version is not updated in "activate" action
• plugins.version is updated in "update" action and "load_plugin()" function (not only for plugins using maintain.class.php)

cases covered:

• autoupdate while active or inactive
• FTP update while active or inactive

Location:

trunk

Files:

• admin/include/plugins.class.php (modified) (2 diffs)
• include/functions_plugins.inc.php (modified) (1 diff)
• include/ws_functions/pwg.extensions.php (modified) (1 diff)

trunk/admin/include/plugins.class.php

@@ -153 +153 @@
       case 'update':
         $previous_version = $this->fs_plugins[$plugin_id]['version'];
-        $upgrade_status = $this->extract_plugin_files('upgrade', $options['revision'], $plugin_id);
-
-        if ($upgrade_status === 'ok')
+        $errors[0] = $this->extract_plugin_files('upgrade', $options['revision'], $plugin_id);
+
+        if ($errors[0] === 'ok')
         {
           $this->get_fs_plugin($plugin_id); // refresh plugins list
+          $new_version = $this->fs_plugins[$plugin_id]['version'];
 
           $plugin_maintain = self::build_maintain_class($plugin_id);
-          $plugin_maintain->update($previous_version, $this->fs_plugins[$plugin_id]['version']);
-        }
-
-        return $upgrade_status;
+          $plugin_maintain->update($previous_version, $new_version, $errors);
+
+          if ($new_version != 'auto')
+          {
+            $query = '
+UPDATE '. PLUGINS_TABLE .'
+  SET version=\''. $new_version .'\'
+  WHERE id=\''. $plugin_id .'\'
+;';
+            pwg_query($query);
+          }
+        }
+
         break;
 
@@ -187 +197 @@
           $query = '
 UPDATE '. PLUGINS_TABLE .'
-  SET state=\'active\',
-    version=\''. $this->fs_plugins[$plugin_id]['version'] .'\'
+  SET state=\'active\'
   WHERE id=\''. $plugin_id .'\'
 ;';

trunk/include/functions_plugins.inc.php

@@ -377 +377 @@
 function autoupdate_plugin(&$plugin)
 {
-  $maintain_file = PHPWG_PLUGINS_PATH.$plugin['id'].'/maintain.class.php';
-
-  // autoupdate is applicable only to plugins with 2.7 architecture
-  if (file_exists($maintain_file))
-  {
-    // try to find the filesystem version in lines 2 to 10 of main.inc.php
-    $fh = fopen(PHPWG_PLUGINS_PATH.$plugin['id'].'/main.inc.php', 'r');
-    $fs_version = null;
-    $i = -1;
-
-    while (($line = fgets($fh))!==false && $fs_version==null && $i<10)
-    {
-      $i++;
-      if ($i < 2) continue; // first lines are typically "<?php" and "/*"
-
-      if (preg_match('/Version:\\s*([\\w.-]+)/', $line, $matches))
-      {
-        $fs_version = $matches[1];
-      }
-    }
-
-    fclose($fh);
-
-    if ($fs_version != null)
-    {
-      global $pwg_loaded_plugins, $page;
-
-      // if version is auto (dev) or superior
-      if (
-          $fs_version == 'auto' or $plugin['version'] == 'auto'
-          or safe_version_compare($plugin['version'], $fs_version, '<')
-        )
-      {
-        // call update method
-        include_once($maintain_file);
-
-        $classname = $plugin['id'].'_maintain';
-        $plugin_maintain = new $classname($plugin['id']);
-        $plugin_maintain->update($plugin['version'], $fs_version, $page['errors']);
-
-        $plugin['version'] = $fs_version;
-
-        // update database (only on production)
-        if ($plugin['version'] != 'auto')
-        {
-          $query = '
+  // try to find the filesystem version in lines 2 to 10 of main.inc.php
+  $fh = fopen(PHPWG_PLUGINS_PATH.$plugin['id'].'/main.inc.php', 'r');
+  $fs_version = null;
+  $i = -1;
+
+  while (($line = fgets($fh))!==false && $fs_version==null && $i<10)
+  {
+    $i++;
+    if ($i < 2) continue; // first lines are typically "<?php" and "/*"
+
+    if (preg_match('/Version:\\s*([\\w.-]+)/', $line, $matches))
+    {
+      $fs_version = $matches[1];
+    }
+  }
+
+  fclose($fh);
+
+  // if version is auto (dev) or superior
+  if ($fs_version != null && (
+        $fs_version == 'auto' || $plugin['version'] == 'auto' ||
+        safe_version_compare($plugin['version'], $fs_version, '<')
+      )
+  ) {
+    $plugin['version'] = $fs_version;
+
+    $maintain_file = PHPWG_PLUGINS_PATH.$plugin['id'].'/maintain.class.php';
+
+    // autoupdate is applicable only to plugins with 2.7 architecture
+    if (file_exists($maintain_file))
+    {
+      global $page;
+
+      // call update method
+      include_once($maintain_file);
+
+      $classname = $plugin['id'].'_maintain';
+      $plugin_maintain = new $classname($plugin['id']);
+      $plugin_maintain->update($plugin['version'], $fs_version, $page['errors']);
+    }
+
+    // update database (only on production)
+    if ($plugin['version'] != 'auto')
+    {
+      $query = '
 UPDATE '. PLUGINS_TABLE .'
   SET version = "'. $plugin['version'] .'"
   WHERE id = "'. $plugin['id'] .'"
 ;';
-          pwg_query($query);
-        }
-      }
+      pwg_query($query);
     }
   }

trunk/include/ws_functions/pwg.extensions.php

@@ -189 +189 @@
     }
 
-    $upgrade_status = $extension->perform_action('update', $extension_id, array('revision'=>$revision));
+    list($upgrade_status) = $extension->perform_action('update', $extension_id, array('revision'=>$revision));
     $extension_name = $extension->fs_plugins[$extension_id]['name'];