Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23907/include/admin
Modified Files:
plugins.inc.php
Log Message:
WTF...seems my commits didn't all get through...
Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- plugins.inc.php 29 Dec 2004 10:18:06 -0000 1.10
+++ plugins.inc.php 2 Jan 2005 15:05:48 -0000 1.11
@@ -495,34 +495,44 @@
<?php echo SELECT_A_PLUGIN_TO_ADD; ?>
<br />
<br />
+<?php
+ $foreignPlugins = array();
+ serendipity_plugin_api::hook_event('backend_plugins_fetchlist', $foreignPlugins);
+?>
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td><strong>Plugin</strong></td>
<td width="100" align="center"><strong>Action</strong></td>
</tr>
<?php
- $plugins = serendipity_plugin_api::get_installed_plugins();
+ if (count($foreignPlugins) > 0) {
+ $pluginstack = $foreignPlugins['pluginstack'];
+ $errorstack = $foreignPlugins['errorstack'];
+ } else {
+ $plugins = serendipity_plugin_api::get_installed_plugins();
- $errorstack = $pluginstack = array();
- $classes = serendipity_plugin_api::enum_plugin_classes(($serendipity['GET']['type'] == 'event'));
- foreach ($classes as $class_data) {
- $plugin =& serendipity_plugin_api::load_plugin($class_data['name'], null, $class_data['pluginPath']);
- if (is_object($plugin)) {
- $bag = new serendipity_property_bag;
- $plugin->introspect($bag);
- $pluginstack[] = array('plugin_class' => $class_data['name'],
- 'class_name' => get_class($plugin),
- 'name' => $bag->get('name'),
- 'desc' => $bag->get('description'),
- 'installable' => !($bag->get('stackable') === false && in_array($class_data['name'], $plugins)),
- 'author' => $bag->get('author'),
- 'version' => $bag->get('version'),
- 'website' => $bag->get('website'),
- 'pluginPath' => $class_data['pluginPath']);
- } else {
- $errorstack[] = $class_data['name'];
+ $errorstack = $pluginstack = array();
+ $classes = serendipity_plugin_api::enum_plugin_classes(($serendipity['GET']['type'] == 'event'));
+ foreach ($classes as $class_data) {
+ $plugin =& serendipity_plugin_api::load_plugin($class_data['name'], null, $class_data['pluginPath']);
+ if (is_object($plugin)) {
+ $bag = new serendipity_property_bag;
+ $plugin->introspect($bag);
+ $pluginstack[] = array('plugin_class' => $class_data['name'],
+ 'class_name' => get_class($plugin),
+ 'name' => $bag->get('name'),
+ 'desc' => $bag->get('description'),
+ 'installable' => !($bag->get('stackable') === false && in_array($class_data['name'], $plugins)),
+ 'author' => $bag->get('author'),
+ 'version' => $bag->get('version'),
+ 'website' => $bag->get('website'),
+ 'pluginPath' => $class_data['pluginPath']);
+ } else {
+ $errorstack[] = $class_data['name'];
+ }
}
}
+
usort($pluginstack, 'serendipity_pluginListSort');
foreach($errorstack as $e_idx => $e_name) {
echo ERROR . ': ' . $e_name . '<br />';
@@ -549,7 +559,7 @@
<td><strong><?php echo $plug['name'] ?></strong></td>
<td width="100" align="center" valign="middle" rowspan="3">
<?php if ( $plug['installable'] == true ) { ?>
- <a href="?serendipity[adminModule]=plugins&serendipity[pluginPath]=<?php echo $plug['pluginPath']; ?>&serendipity[install_plugin]=<?php echo $plug['plugin_class'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/install_now.png') ?>" title="<?php echo INSTALL ?>" alt="<?php echo INSTALL ?>" border="0"></a>
+ <a href="?serendipity[adminModule]=plugins&serendipity[pluginPath]=<?php echo $plug['pluginPath']; ?>&serendipity[install_plugin]=<?php echo $plug['plugin_class'] . $plug['customURI'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/install_now.png') ?>" title="<?php echo INSTALL ?>" alt="<?php echo INSTALL ?>" border="0"></a>
<?php } else { ?>
<span style="color: #cccccc"><?php echo ALREADY_INSTALLED ?></span>
<?php } ?>
@@ -595,6 +605,7 @@
$authorid = '0';
}
+ serendipity_plugin_api::hook_event('backend_plugins_fetchplugin', $serendipity['GET']);
$inst = serendipity_plugin_api::create_plugin_instance($serendipity['GET']['install_plugin'], null, (serendipity_plugin_api::is_event_plugin($serendipity['GET']['install_plugin']) ? 'event': 'right'), $authorid, serendipity_db_escape_string($serendipity['GET']['pluginPath']));
/* Load the new plugin */
@@ -625,7 +636,7 @@
<h3><?php echo SIDEBAR_PLUGINS ?></h3>
<a href="?serendipity[adminModule]=plugins&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); ?>
<br />
@@ -633,6 +644,7 @@
<h3><?php echo EVENT_PLUGINS ?></h3>
<a href="?serendipity[adminModule]=plugins&serendipity[adminAction]=addnew&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); ?>
<?php
|
