From 6a58e3a8ff020d1031e27adb710287389eb715cf Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Fri, 2 Apr 2010 21:51:22 -0400
Subject: [PATCH] Shout: fix admin paths for account management

---
 shout/templates/admin/accounts/edit.inc | 4 ++--
 shout/templates/admin/accounts/list.inc | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/shout/templates/admin/accounts/edit.inc b/shout/templates/admin/accounts/edit.inc
index e42e0b1a3..f197492c3 100644
--- a/shout/templates/admin/accounts/edit.inc
+++ b/shout/templates/admin/accounts/edit.inc
@@ -1,8 +1,8 @@
 <?php
-$Form->renderActive($RENDERER, $vars, Horde::applicationUrl('admin.php'), 'post');
+$Form->renderActive($RENDERER, $vars, Horde::applicationUrl('admin/accounts.php'), 'post');
 
 if ($vars->get('action') == 'edit') {
-    $deleteUrl = Horde::applicationUrl('admin.php');
+    $deleteUrl = Horde::applicationUrl('admin/accounts.php');
     $params = array ('action' => 'delete',
                      'account' => $account);
     $deleteUrl = Horde_Util::addParameter($deleteUrl, $params);
diff --git a/shout/templates/admin/accounts/list.inc b/shout/templates/admin/accounts/list.inc
index d15573505..e62900ef7 100644
--- a/shout/templates/admin/accounts/list.inc
+++ b/shout/templates/admin/accounts/list.inc
@@ -1,7 +1,3 @@
-<div class="header">
-    Account: <?php echo $_SESSION['shout']['curaccount']['name']; ?>
-</div>
-
 <div id="extensionList">
     <table width="100%" cellspacing="0" class="striped">
         <tr>
@@ -10,7 +6,7 @@
             <td class="uheader">Admin PIN</td>
         </tr>
         <?php
-            $url = Horde::applicationUrl("admin.php");
+            $url = Horde::applicationUrl("admin/accounts.php");
             $editurl = Horde_Util::addParameter($url, 'action', 'edit');
             $deleteurl = Horde_Util::addParameter($url, 'action', 'delete');
             foreach ($accounts as $acctinfo) {
-- 
2.11.0