Changeset 855:990bdbb122aa

Timestamp:

08/01/12 11:36:53 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

Oops

Files:

• admin/plugins.php (modified) (5 diffs)
• inc/core/class.dc.modules.php (modified) (1 diff)
• plugins/antispam/_define.php (modified) (1 diff)

admin/plugins.php

@@ -227 +227 @@
      echo
      '<h3>'.__('Activated plugins').'</h3>'.
-     '<table class="clear plugins"><tr>'.
-     '<th>'.__('Plugin').'</th>'.
-     '<th class="nowrap">'.__('Version').'</th>'.
-     '<th class="nowrap">'.__('Details').'</th>'.
-     '<th class="nowrap">'.__('Action').'</th>'.
-     '</tr>';
+     '<table class="clear plugins">'.
+     '<caption>'.__('Activated plugin list').'</caption>'.
+     '<thead><tr>'.
+     '<th scope="col">'.__('Plugin').'</th>'.
+     '<th scope="col" class="nowrap">'.__('Version').'</th>'.
+     '<th scope="col" class="nowrap">'.__('Details').'</th>'.
+     '<th scope="col" class="nowrap">'.__('Action').'</th>'.
+     '</tr></thead>'.
+     '<tbody>';
      
      foreach ($p_available as $k => $v)
      {
-
           $is_deletable = $is_writable && preg_match('!^'.$p_path_pat.'!',$v['root']);
           $is_deactivable = $v['root_writable'];
@@ -242 +244 @@
           echo
           '<tr class="line wide">'.
-          '<td class="minimal nowrap"><strong>'.html::escapeHTML($k).'</strong></td>'.
+          '<th scope="row" class="minimal nowrap"><strong>'.html::escapeHTML($k).'</strong></th>'.
           '<td class="minimal">'.html::escapeHTML($v['version']).'</td>'.
           '<td class="maximal"><strong>'.html::escapeHTML($v['name']).'</strong> '.
-          '<br />'.html::escapeHTML($v['desc']);
-          echo '</td>'.
+          '<br />'.html::escapeHTML($v['desc']).'</td>'.
           '<td class="nowrap action">';
           
@@ -267 +268 @@
      }
      echo
+     '</tbody>'.
      '</table>';
 }
@@ -276 +278 @@
      echo
      '<h3>'.__('Deactivated plugins').'</h3>'.
-     '<table class="clear plugins"><tr>'.
-     '<th>'.__('Plugin').'</th>'.
-     '<th class="nowrap">'.__('Action').'</th>'.
-     '</tr>';
+     '<table class="clear plugins">'.
+     '<caption>'.__('Deactivated plugin list').'</caption>'.
+     '<thead><tr>'.
+     '<th scope="col">'.__('Plugin').'</th>'.
+     '<th scope="col" class="nowrap">'.__('Action').'</th>'.
+     '</tr></thead>'.
+     '<tbody>';
      
      foreach ($p_disabled as $k => $v)
      {
-          $dep = $core->plugins->getUnmatchedDependencies($k); print_r($dep);
-          $invalid=(count($dep) > 0);
-
           $is_deletable = $is_writable && preg_match('!^'.$p_path_pat.'!',$v['root']);
-          $is_activable = !$invalid && $v['root_writable'];
+          $is_activable = $v['root_writable'];
           
           echo
-          '<tr class="line wide'.($invalid ? " error" : "").'">'.
-          '<td class="maximal nowrap"><strong>'.html::escapeHTML($k).'</strong>';
-          if ($invalid) {
-               echo '<br /><span style="color:#c00"><strong>'.__('Unmet dependencies: ').'</strong>'.
-                    join(', ',$dep).'</span>';
-          }
-          echo '</td>';
-
+          '<tr class="line wide">'.
+          '<th scope="row" class="maximal nowrap"><strong>'.html::escapeHTML($k).'</strong></th>'.
           '<td class="nowrap action">';
           
@@ -319 +315 @@
      }
      echo
+     '</tbody>'.
      '</table>';
 }

inc/core/class.dc.modules.php

@@ -323 +323 @@
      }
      
-     public function getUnmatchedDependencies($id) {
-          if (isset($this->modules[$id])){
-               $mod = $this->modules[$id];
-          } elseif (isset($this->disabled[$id])) {
-               $mod = $this->disabled[$id];
-          } else {
-               return array();
-          }
-          if (!isset($mod['depends'])) {
-               return array();
-          }
-          $failures=array();
-          $deps = $mod['depends'];
-          foreach ($deps as $n => $v) {
-               if (is_array($v)) {
-                    $min_ver = $v[0];
-                    $max_ver = $v[1];
-                    $ver_txt = sprintf(__('%s<=%s<=%s'),$min_ver,$n,$max_ver);
-               } else {
-                    $min_ver = $v;
-                    $max_ver = '';
-                    $ver_txt = sprintf(__('%s>=%s'),$n,$min_ver);
-               }
-               if (!isset($this->modules[$n])) {
-                    $failures[$n] = sprintf(__('%s (missing)'),$ver_txt);
-               } else {
-                    $modver = $mod['version'];
-                    if ((($min_ver != '' ) && version_compare($modver, $minver,'<'))
-                         || (($max_ver != '' ) && version_compare($modver, $maxver,'>'))){
-                         $failures[$n] = sprintf(__('%s (current : %s)'),$ver_txt,$modver);
-                    }
-               }
-          }
-          return $failures;
-     }
-     
      /**
      This method installs module with ID <var>$id</var> and having a _install

plugins/antispam/_define.php

@@ -19 +19 @@
      array(
           'permissions' =>    'usage,contentadmin',
-          'depends' => array (
-               'comments' => '1.0'
-          ),
           'priority' =>       10
      )