Changeset 29773

Timestamp:

Sep 24, 2014, 7:30:08 PM (10 years ago)

Author:

mistic100

Message:

fix plugins autoupdate: call ##_maintain::update when updating from back-office

Location:

trunk

Files:

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

trunk/admin/include/plugins.class.php

@@ -90 +90 @@
     $classname = $plugin_id.'_maintain';
 
+    // 2.7 pattern (OO only)
     if (file_exists($file_to_include.'.class.php'))
     {
@@ -96 +97 @@
     }
 
+    // before 2.7 pattern (OO or procedural)
     if (file_exists($file_to_include.'.inc.php'))
     {
@@ -115 +117 @@
    * @param array - errors
    */
-  function perform_action($action, $plugin_id)
+  function perform_action($action, $plugin_id, $options=array())
   {
     if (isset($this->db_plugins_by_id[$plugin_id]))
@@ -144 +146 @@
           pwg_query($query);
         }
+        break;
+
+      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')
+        {
+          $this->get_fs_plugin($plugin_id); // refresh plugins list
+          $plugin_maintain->update($previous_version, $this->fs_plugins[$plugin_id]['version']);
+        }
+
+        return $upgrade_status;
         break;
 
@@ -243 +258 @@
       if ($file!='.' and $file!='..')
       {
-        $path = PHPWG_PLUGINS_PATH.$file;
-        if (is_dir($path) and !is_link($path)
-            and preg_match('/^[a-zA-Z0-9-_]+$/', $file )
-            and file_exists($path.'/main.inc.php')
-            )
-        {
-          $plugin = array(
-              'name'=>$file,
-              'version'=>'0',
-              'uri'=>'',
-              'description'=>'',
-              'author'=>'',
-            );
-          $plg_data = file_get_contents($path.'/main.inc.php', null, null, 0, 2048);
-
-          if (preg_match("|Plugin Name:\\s*(.+)|", $plg_data, $val))
-          {
-            $plugin['name'] = trim( $val[1] );
-          }
-          if (preg_match("|Version:\\s*([\\w.-]+)|", $plg_data, $val))
-          {
-            $plugin['version'] = trim($val[1]);
-          }
-          if (preg_match("|Plugin URI:\\s*(https?:\\/\\/.+)|", $plg_data, $val))
-          {
-            $plugin['uri'] = trim($val[1]);
-          }
-          if ($desc = load_language('description.txt', $path.'/', array('return' => true)))
-          {
-            $plugin['description'] = trim($desc);
-          }
-          elseif (preg_match("|Description:\\s*(.+)|", $plg_data, $val))
-          {
-            $plugin['description'] = trim($val[1]);
-          }
-          if (preg_match("|Author:\\s*(.+)|", $plg_data, $val))
-          {
-            $plugin['author'] = trim($val[1]);
-          }
-          if (preg_match("|Author URI:\\s*(https?:\\/\\/.+)|", $plg_data, $val))
-          {
-            $plugin['author uri'] = trim($val[1]);
-          }
-          if (!empty($plugin['uri']) and strpos($plugin['uri'] , 'extension_view.php?eid='))
-          {
-            list( , $extension) = explode('extension_view.php?eid=', $plugin['uri']);
-            if (is_numeric($extension)) $plugin['extension'] = $extension;
-          }
-
-          // IMPORTANT SECURITY !
-          $plugin = array_map('htmlspecialchars', $plugin);
-          $this->fs_plugins[$file] = $plugin;
+        if (preg_match('/^[a-zA-Z0-9-_]+$/', $file))
+        {
+          $this->get_fs_plugin($file);
         }
       }
     }
     closedir($dir);
+  }
+
+  /**
+   * Load metadata of a plugin in `fs_plugins` array
+   * @from 2.7
+   * @param $plugin_id
+   * @return false|array
+   */
+  function get_fs_plugin($plugin_id)
+  {
+    $path = PHPWG_PLUGINS_PATH.$plugin_id;
+
+    if (is_dir($path) and !is_link($path)
+        and file_exists($path.'/main.inc.php')
+        )
+    {
+      $plugin = array(
+          'name'=>$plugin_id,
+          'version'=>'0',
+          'uri'=>'',
+          'description'=>'',
+          'author'=>'',
+        );
+      $plg_data = file_get_contents($path.'/main.inc.php', null, null, 0, 2048);
+
+      if (preg_match("|Plugin Name:\\s*(.+)|", $plg_data, $val))
+      {
+        $plugin['name'] = trim( $val[1] );
+      }
+      if (preg_match("|Version:\\s*([\\w.-]+)|", $plg_data, $val))
+      {
+        $plugin['version'] = trim($val[1]);
+      }
+      if (preg_match("|Plugin URI:\\s*(https?:\\/\\/.+)|", $plg_data, $val))
+      {
+        $plugin['uri'] = trim($val[1]);
+      }
+      if ($desc = load_language('description.txt', $path.'/', array('return' => true)))
+      {
+        $plugin['description'] = trim($desc);
+      }
+      elseif (preg_match("|Description:\\s*(.+)|", $plg_data, $val))
+      {
+        $plugin['description'] = trim($val[1]);
+      }
+      if (preg_match("|Author:\\s*(.+)|", $plg_data, $val))
+      {
+        $plugin['author'] = trim($val[1]);
+      }
+      if (preg_match("|Author URI:\\s*(https?:\\/\\/.+)|", $plg_data, $val))
+      {
+        $plugin['author uri'] = trim($val[1]);
+      }
+      if (!empty($plugin['uri']) and strpos($plugin['uri'] , 'extension_view.php?eid='))
+      {
+        list( , $extension) = explode('extension_view.php?eid=', $plugin['uri']);
+        if (is_numeric($extension)) $plugin['extension'] = $extension;
+      }
+
+      // IMPORTANT SECURITY !
+      $plugin = array_map('htmlspecialchars', $plugin);
+      $this->fs_plugins[$plugin_id] = $plugin;
+
+      return $plugin;
+    }
+
+    return false;
   }
 

trunk/include/ws_functions/pwg.extensions.php

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