Changeset 11047 for trunk

Timestamp:

May 25, 2011, 12:54:59 PM (13 years ago)

Author:

patdenice

Message:

merge r11043 from branch 2.2 to trunk
feature:2250
Add obsolete_extensions.list file in install directory.
Incompatible plugins is checked through ajax.

Location:

trunk

Files:

• admin/include/plugins.class.php (modified) (1 diff)
• admin/plugins_installed.php (modified) (5 diffs)
• admin/themes/default/template/plugins_list.tpl (modified) (6 diffs)
• install/obsolete_extensions.list (copied) (copied from branches/2.2/install/obsolete_extensions.list)

trunk/admin/include/plugins.class.php

@@ -535 +535 @@
   function get_merged_extensions($version=PHPWG_VERSION)
   {
-    if (isset($_SESSION['merged_extensions']) and $_SESSION['merged_extensions']['~~expire~~'] > time())
-    {
-      return $_SESSION['merged_extensions'];
-    }
-
-    $_SESSION['merged_extensions'] = array('~~expire~~' => time() + 600);
-
-    if (fetchRemote(PHPWG_URL.'/download/merged_extensions.txt', $result))
-    {
-      $rows = explode("\n", $result);
-      foreach ($rows as $row)
-      {
-        if (preg_match('/^(\d+\.\d+): *(.*)$/', $row, $match))
-        {
-          if (version_compare($version, $match[1], '>='))
-          {
-            $extensions = explode(',', trim($match[2]));
-            $_SESSION['merged_extensions'] = array_merge($_SESSION['merged_extensions'], $extensions);
-          }
-        }
-      }
-    }
-
-    return $_SESSION['merged_extensions'];
+    $file = PHPWG_ROOT_PATH.'install/obsolete_extensions.list';
+    $merged_extensions = array();
+
+    if (file_exists($file) and $obsolete_ext = file($file, FILE_IGNORE_NEW_LINES) and !empty($obsolete_ext))
+    {
+      foreach ($obsolete_ext as $ext)
+      {
+        if (preg_match('/^(\d+) ?: ?(.*?)$/', $ext, $matches))
+        {
+          $merged_extensions[$matches[1]] = $matches[2];
+        }
+      }
+    }
+    return $merged_extensions;
   }
   

trunk/admin/plugins_installed.php

@@ -65 +65 @@
 }
 
+//--------------------------------------------------------Incompatible Plugins
+if (isset($_GET['incompatible_plugins']))
+{
+  $incompatible_plugins = array();
+  foreach ($plugins->get_incompatible_plugins() as $plugin => $version)
+  {
+    if ($plugin == '~~expire~~') continue;
+    array_push($incompatible_plugins, $plugin);
+    
+  }
+  echo json_encode($incompatible_plugins);
+  exit;
+}
+
 // +-----------------------------------------------------------------------+
 // |                     start template output                             |
@@ -70 +84 @@
 
 $plugins->sort_fs_plugins('name');
-$plugins->get_merged_extensions();
-$plugins->get_incompatible_plugins();
+$merged_extensions = $plugins->get_merged_extensions();
 $merged_plugins = false;
 $tpl_plugins = array();
@@ -81 +94 @@
   {
     // Incompatible plugins must be reinitilized
-    $plugins->get_incompatible_plugins(true);
+    unset($_SESSION['incompatible_plugins']);
   }
 
@@ -93 +106 @@
     'AUTHOR_URL' => @$fs_plugin['author uri'],
     'U_ACTION' => sprintf($action_url, $plugin_id),
-    'INCOMPATIBLE' => isset($_SESSION['incompatible_plugins'][$plugin_id]),
     );
 
@@ -105 +117 @@
   }
 
-  if (isset($fs_plugin['extension']) and in_array($fs_plugin['extension'], $_SESSION['merged_extensions']))
+  if (isset($fs_plugin['extension']) and isset($merged_extensions[$fs_plugin['extension']]))
   {
     $plugins->perform_action('uninstall', $plugin_id);

trunk/admin/themes/default/template/plugins_list.tpl

@@ -4 +4 @@
 /* incompatible message */
 var incompatible_msg = '{'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'|@translate|@escape:'javascript'}';
-incompatible_msg += '\n';
-incompatible_msg += '{'Do you want to activate anyway?'|@translate|@escape:'javascript'}';
+var activate_msg = '\n{'Do you want to activate anyway?'|@translate|@escape:'javascript'}';
 
 /* group action */
@@ -40 +39 @@
   };
 
-  /* incompatible message */
-  jQuery('.incompatible a.incompatible').click(function() {
-    return confirm(incompatible_msg);
+  /* incompatible plugins */
+  jQuery(document).ready(function() {
+    jQuery.ajax({
+      method: 'GET',
+      url: 'admin.php',
+      data: { page: 'plugins_installed', incompatible_plugins: true },
+      dataType: 'json',
+      success: function(data) {
+        for (i=0;i<data.length;i++) {
+          {/literal}
+          {if $plugin_display == 'complete'}
+            jQuery('#'+data[i]+' .pluginBoxNameCell').prepend('<a class="warning" title="'+incompatible_msg+'"></a>')
+          {else}
+            jQuery('#'+data[i]+' .pluginMiniBoxNameCell').prepend('<span class="warning" title="'+incompatible_msg+'"></span>')
+          {/if}
+          {literal}
+          jQuery('#'+data[i]).addClass('incompatible');
+          jQuery('#'+data[i]+' .activate').attr('onClick', 'return confirm(incompatible_msg + activate_msg);');
+        }
+        jQuery('.warning').tipTip({
+          'delay' : 0,
+          'fadeIn' : 200,
+          'fadeOut' : 200,
+          'maxWidth':'250px'
+        });
+      }
+    });
   });
   
   /* TipTips */
-  jQuery('.warning').tipTip({
-    'delay' : 0,
-    'fadeIn' : 200,
-    'fadeOut' : 200,
-    'maxWidth':'250px'
-  });
   jQuery('.plugin-restore').tipTip({
     'delay' : 0,
@@ -118 +135 @@
    
   {if $plugin_display == 'complete'}
-    <div id="{$plugin.ID}" class="pluginBox {$plugin.STATE}{if $plugin.INCOMPATIBLE} incompatible{/if}">
+    <div id="{$plugin.ID}" class="pluginBox">
       <table>
         <tr>
           <td class="pluginBoxNameCell">
-            {if $plugin.INCOMPATIBLE}<a class="warning" title="{'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'|@translate|@escape:'html'}"></a>{/if}
             {$plugin.NAME}
           </td>
@@ -134 +150 @@
 
           {elseif $plugin.STATE == 'inactive'}
-            <a href="{$plugin.U_ACTION}&amp;action=activate" {if $plugin.INCOMPATIBLE}class="incompatible"{/if}>{'Activate'|@translate}</a>
+            <a href="{$plugin.U_ACTION}&amp;action=activate" class="activate">{'Activate'|@translate}</a>
             | <a href="{$plugin.U_ACTION}&amp;action=delete" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Delete'|@translate}</a>
 
@@ -166 +182 @@
     {/if}
           
-    <div id="{$plugin.ID}" class="pluginMiniBox {$plugin.STATE}{if $plugin.INCOMPATIBLE} incompatible{/if}">
+    <div id="{$plugin.ID}" class="pluginMiniBox">
       <div class="pluginMiniBoxNameCell">
-        {if $plugin.INCOMPATIBLE}<span class="warning" title="{'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'|@translate|@escape:'html'}"></span>{/if}
         {$plugin.NAME}
         <a class="showInfo" title="{if !empty($author)}{'By %s'|@translate|@sprintf:$author} | {/if}{'Version'|@translate} {$version}<br/>{$plugin.DESC|@escape:'html'}">i</a>
@@ -179 +194 @@
 
         {elseif $plugin.STATE == 'inactive'}
-          <a href="{$plugin.U_ACTION}&amp;action=activate" {if $plugin.INCOMPATIBLE}class="incompatible"{/if}>{'Activate'|@translate}</a>
+          <a href="{$plugin.U_ACTION}&amp;action=activate" class="activate">{'Activate'|@translate}</a>
           | <a href="{$plugin.U_ACTION}&amp;action=delete" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Delete'|@translate}</a>