Shout: Make sure the add/edit form renders properly

diff --git a/shout/devices.php b/shout/devices.php
index 3615301..198e6fe 100644 (file)
--- a/shout/devices.php
+++ b/shout/devices.php
@@ -111,8 +111,6 @@ require SHOUT_TEMPLATES . '/menu.inc';
 
 $notification->notify();
 
-echo "<br>\n";
-
 require SHOUT_TEMPLATES . '/devices/' . $action . '.inc';
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';

diff --git a/shout/extensions.php b/shout/extensions.php
index 6378ba2..a63a6a5 100644 (file)
--- a/shout/extensions.php
+++ b/shout/extensions.php
@@ -114,8 +114,6 @@ require SHOUT_TEMPLATES . '/menu.inc';
 
 $notification->notify();
 
-echo "<br>\n";
-
 require SHOUT_TEMPLATES . '/extensions/' . $action . '.inc';
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';

diff --git a/shout/templates/extensions/edit.inc b/shout/templates/extensions/edit.inc
index e9fe5a6..ecab323 100644 (file)
--- a/shout/templates/extensions/edit.inc
+++ b/shout/templates/extensions/edit.inc
@@ -1,8 +1,10 @@
 <?php
-$Form->open($RENDERER, $vars, Horde::applicationUrl('extensions.php'), 'post');
-$deleteUrl = Horde::applicationUrl('extensions.php');
-$params = array ('action' => 'delete',
-                 'extension' => $extension);
-$deleteUrl = Horde_Util::addParameter($deleteUrl, $params);
-?>
-<a href="<?php echo $deleteUrl; ?>">Delete Extension</a>
+$Form->renderActive($RENDERER, $vars, Horde::applicationUrl('extensions.php'), 'post');
+
+if ($vars->get('action') == 'edit') {
+    $deleteUrl = Horde::applicationUrl('extensions.php');
+    $params = array ('action' => 'delete',
+                     'extension' => $extension);
+    $deleteUrl = Horde_Util::addParameter($deleteUrl, $params);
+    echo '<a href="<?php echo $deleteUrl; ?>">Delete Extension</a>';
+}