Fix XHTML compliance of the plugin manager

diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php
index 6985ba5f7c998447065c4166bd267d7f3c9410f3..61c7da1bfaa0b3eabeb542f286aa9a7db0137b95 100644 (file)
--- a/include/admin/plugins.inc.php
+++ b/include/admin/plugins.inc.php
@@ -312,9 +312,9 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
                         <?php if ( $plug['requirements_fail'] == true ) { ?>
                             <span style="color: #cccccc"><?php printf(UNMET_REQUIREMENTS, implode(', ', $notice['requirements_failures'])); ?></span>
                         <?php } elseif ( $plug['upgradable'] == true ) { ?>
-                            <a href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]=<?php echo $plug['pluginPath']; ?>&amp;serendipity[install_plugin]=<?php echo $plug['plugin_class'] . $plug['customURI'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/upgrade_now.png') ?>" title="<?php echo UPGRADE ?>" alt="<?php echo UPGRADE ?>" border="0"></a>
+                            <a href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]=<?php echo $plug['pluginPath']; ?>&amp;serendipity[install_plugin]=<?php echo $plug['plugin_class'] . $plug['customURI'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/upgrade_now.png') ?>" title="<?php echo UPGRADE ?>" alt="<?php echo UPGRADE ?>" border="0" /></a>
                         <?php } elseif ($plug['installable'] == true) { ?>
-                            <a href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]=<?php echo $plug['pluginPath']; ?>&amp;serendipity[install_plugin]=<?php echo $plug['plugin_class'] . $plug['customURI'] ?>"><img src="<?php echo $installimage ?>" title="<?php echo INSTALL ?>" alt="<?php echo INSTALL ?>" border="0"></a>
+                            <a href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]=<?php echo $plug['pluginPath']; ?>&amp;serendipity[install_plugin]=<?php echo $plug['plugin_class'] . $plug['customURI'] ?>"><img src="<?php echo $installimage ?>" title="<?php echo INSTALL ?>" alt="<?php echo INSTALL ?>" border="0" /></a>
                         <?php } else { ?>
                             <span style="color: #cccccc"><?php echo ALREADY_INSTALLED ?></span>
                         <?php } ?>
@@ -361,7 +361,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
             }
             $pluginsidelist = explode(',', $matches[2]);
             foreach($pluginsidelist AS $pluginname) {
-                $pluginname = trim(urldecode($pluginname));
+                $pluginname = trim(urldecode(str_replace(array('s9ycid', '-'), array('', '%'), $pluginname)));
 
                 if (empty($pluginname)) {
                     continue;
@@ -456,7 +456,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
     <br />
 
     <h3><?php echo SIDEBAR_PLUGINS ?></h3>
-    <a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/install.png') ?>" style="border: 0px none ; vertical-align: middle; display: inline;" alt=""><?php echo sprintf(CLICK_HERE_TO_INSTALL_PLUGIN, SIDEBAR_PLUGIN) ?></a>
+    <a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/install.png') ?>" style="border: 0px none ; vertical-align: middle; display: inline;" alt="" /><?php echo sprintf(CLICK_HERE_TO_INSTALL_PLUGIN, SIDEBAR_PLUGIN) ?></a>
     <?php serendipity_plugin_api::hook_event('backend_plugins_sidebar_header', $serendipity); ?>
     <?php show_plugins(false); ?>
 
@@ -464,7 +464,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
     <br />
 
     <h3><?php echo EVENT_PLUGINS ?></h3>
-    <a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[type]=event" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/install.png') ?>" style="border: 0px none ; vertical-align: middle; display: inline;" alt=""><?php echo sprintf(CLICK_HERE_TO_INSTALL_PLUGIN, EVENT_PLUGIN) ?></a>
+    <a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[type]=event" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/install.png') ?>" style="border: 0px none ; vertical-align: middle; display: inline;" alt="" /><?php echo sprintf(CLICK_HERE_TO_INSTALL_PLUGIN, EVENT_PLUGIN) ?></a>
     <?php serendipity_plugin_api::hook_event('backend_plugins_event_header', $serendipity); ?>
     <?php show_plugins(true); ?>
 

diff --git a/include/functions_plugins_admin.inc.php b/include/functions_plugins_admin.inc.php
index 462bfdd58e55fc9a2e2f169fbab3858819045e24..f7c1683a847228670f97f2091335f2bc711b3aef 100644 (file)
--- a/include/functions_plugins_admin.inc.php
+++ b/include/functions_plugins_admin.inc.php
@@ -78,6 +78,7 @@ function show_plugins($event_only = false)
     echo serendipity_setFormToken();
 ?>
     <table class="pluginmanager" border="0" cellpadding="5" cellspacing="3" width="100%">
+        <tr>
 <?php
     $errors     = array();
 
@@ -102,8 +103,9 @@ function show_plugins($event_only = false)
         $sort_idx = 0;
         foreach ($plugins as $plugin_data) {
             $total++;
-            $plugin =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid']);
-            $key    = urlencode($plugin_data['name']);
+            $plugin  =& serendipity_plugin_api::load_plugin($plugin_data['name'], $plugin_data['authorid']);
+            $key     = urlencode($plugin_data['name']);
+            $css_key = 's9ycid' . str_replace('%', '-', $key);
             $is_plugin_owner    = ($plugin_data['authorid'] == $serendipity['authorid'] || serendipity_checkPermission('adminPluginsMaintainOthers'));
             $is_plugin_editable = ($is_plugin_owner || $plugin_data['authorid'] == '0');
 
@@ -148,17 +150,17 @@ function show_plugins($event_only = false)
             if ($sort_idx == (count($plugins)-1)) {
                 $movedown = '&nbsp;';
             } else {
-                $movedown = ($moveup != '' ? '&nbsp;' : '') . '<a href="?' . serendipity_setFormToken('url') . '&amp;serendipity[adminModule]=plugins&amp;submit=move+down&serendipity[plugin_to_move]=' . $key . $event_only_uri . '" style="border: 0"><img src="' . serendipity_getTemplateFile('admin/img/downarrow.png') . '" height="16" width="16" alt="'. DOWN .'" border="0" /></a>';
+                $movedown = ($moveup != '' ? '&nbsp;' : '') . '<a href="?' . serendipity_setFormToken('url') . '&amp;serendipity[adminModule]=plugins&amp;submit=move+down&amp;serendipity[plugin_to_move]=' . $key . $event_only_uri . '" style="border: 0"><img src="' . serendipity_getTemplateFile('admin/img/downarrow.png') . '" height="16" width="16" alt="'. DOWN .'" border="0" /></a>';
             }
 ?>
-            <li class="pluginmanager_item_<?php echo ($sort_idx % 2 ? 'even' : 'uneven'); ?>" id="<?php echo $key; ?>">
-                <a href="#grab<?php echo $key; ?>" id="grab<?php echo $key; ?>" class="pluginmanager_grablet"></a>
+            <li class="pluginmanager_item_<?php echo ($sort_idx % 2 ? 'even' : 'uneven'); ?>" id="<?php echo $css_key; ?>">
+                <a href="javascript: return false" id="grab<?php echo $css_key; ?>" class="pluginmanager_grablet"></a>
                 <?php if ($is_plugin_editable) { ?>
                     <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>" />
                 <?php } ?>
 
                 <?php if ( $can_configure ) { ?>
-                    <a class="pluginmanager_configure" href="?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]=<?php echo $key ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/configure.png') ?>" style="border: 0; vertical-align: bottom;"></a>
+                    <a class="pluginmanager_configure" href="?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]=<?php echo $key ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/configure.png') ?>" style="border: 0; vertical-align: bottom;" alt="[C]" /></a>
                 <?php } ?>
 
                     <span class="pluginmanager_title">
@@ -182,6 +184,7 @@ function show_plugins($event_only = false)
     }
 
 ?>
+        </tr>
         <tr>
             <td colspan="3" align="right"><?php printf(PLUGIN_AVAILABLE_COUNT, $total); ?></td>
         </tr>

diff --git a/serendipity_admin.php b/serendipity_admin.php
index 77b7a63365c6a9d56e40f9295ccf22b6348bdc7e..e0dd96c37fe419d8e4ff1b0ff7dd2302cc225496 100644 (file)
--- a/serendipity_admin.php
+++ b/serendipity_admin.php
@@ -37,6 +37,7 @@ if (serendipity_is_iframe()) {
 }
 
 ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
     <head>
         <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>