From 49558ca69d27171707963f3d5fffa25451f3f490 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 21 Sep 2009 16:31:43 +0200
Subject: [PATCH] MFB: Apply 'list_users' setting to owners too. Fix XHTML.

---
 kronolith/perms.php                 |  2 +-
 kronolith/templates/perms/perms.inc | 62 ++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/kronolith/perms.php b/kronolith/perms.php
index 05a99e5c4..2bc78612e 100644
--- a/kronolith/perms.php
+++ b/kronolith/perms.php
@@ -48,7 +48,7 @@ case 'editform':
 
         // Process owner and owner permissions.
         $old_owner = $share->get('owner');
-        $new_owner = Horde_Auth::addHook(Horde_Util::getFormData('owner', $old_owner));
+        $new_owner = Horde_Auth::addHook(Horde_Util::getFormData('owner_select', Horde_Util::getFormData('owner_input', $old_owner)));
         if ($old_owner !== $new_owner && !empty($new_owner)) {
             if ($old_owner != Horde_Auth::getAuth() && !Horde_Auth::isAdmin()) {
                 $notification->push(_("Only the owner or system administrator may change ownership or owner permissions for a share"), 'horde.error');
diff --git a/kronolith/templates/perms/perms.inc b/kronolith/templates/perms/perms.inc
index c4a42dd9e..48f6db786 100644
--- a/kronolith/templates/perms/perms.inc
+++ b/kronolith/templates/perms/perms.inc
@@ -23,23 +23,21 @@
   </td>
 </tr>
 <tr>
-<?php if ($auth->hasCapability('list')): ?>
   <td class="light" colspan="7">
-    <label for="owner" class="hidden"><?php echo _("Owner:") ?></label>
-    <select id="owner" name="owner">
+<?php if ($auth->hasCapability('list') && ($GLOBALS['conf']['auth']['list_users'] == 'list' || $GLOBALS['conf']['auth']['list_users'] == 'both')): ?>
+    <label for="owner_select" class="hidden"><?php echo _("Owner:") ?></label>
+    <select id="owner_select" name="owner_select">
       <option value=""><?php echo _("Select a new owner:") ?></option>
       <option value="<?php echo htmlspecialchars(Horde_Auth::removeHook($owner)) ?>" selected="selected"><?php echo htmlspecialchars(Horde_Auth::removeHook($owner)) ?></option>
 <?php foreach ($userList as $user) { if ($user != Horde_Auth::removeHook($owner)) { ?>
       <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars($user) ?></option>
 <?php } } ?>
     </select>
-  </td>
 <?php else: ?>
-  <td class="light">
-    <label for="owner" class="hidden"><?php echo _("Owner:") ?></label>
-    <input type="text" id="owner" name="owner" value="<?php echo htmlspecialchars(Horde_Auth::removeHook($owner)) ?>" />
-  </td>
+    <label for="owner_input" class="hidden"><?php echo _("Owner:") ?></label>
+    <input type="text" id="owner_input" name="owner_input" value="<?php echo htmlspecialchars(Horde_Auth::removeHook($owner)) ?>" />
 <?php endif; ?>
+  </td>
 </tr>
 
 <!-- Spacer -->
@@ -215,8 +213,8 @@ foreach ($userperms as $user => $uperm) {
 <?php if ($auth->hasCapability('list') && (!isset($GLOBALS['conf']['auth']['list_users']) || $GLOBALS['conf']['auth']['list_users'] == 'list' || $GLOBALS['conf']['auth']['list_users'] == 'both')): ?>
 <tr>
   <td class="light">
-    <label for="u_names_new" class="hidden"><?php echo _("Select a user to add:") ?></label>
-    <select id="u_names_new" name="u_names[||new_select]">
+    <label for="u_names_new_select" class="hidden"><?php echo _("Select a user to add:") ?></label>
+    <select id="u_names_new_select" name="u_names[||new_select]">
       <option value=""><?php echo _("Select a user to add:") ?></option>
 <?php
 foreach ($userList as $user) {
@@ -228,24 +226,24 @@ foreach ($userList as $user) {
     </select>
   </td>
   <td align="center">
-    <input type="checkbox" id="u_show_new" name="u_show[||new_select]" />
-    <label for="u_show_new" class="hidden"><?php echo _("Show") ?></label>
+    <input type="checkbox" id="u_show_new_select" name="u_show[||new_select]" />
+    <label for="u_show_new_select" class="hidden"><?php echo _("Show") ?></label>
   </td>
   <td align="center">
-    <input type="checkbox" id="u_read_new" name="u_read[||new_select]" />
-    <label for="u_read_new" class="hidden"><?php echo _("Read") ?></label>
+    <input type="checkbox" id="u_read_new_select" name="u_read[||new_select]" />
+    <label for="u_read_new_select" class="hidden"><?php echo _("Read") ?></label>
   </td>
   <td align="center">
-    <input type="checkbox" id="u_edit_new" name="u_edit[||new_select]" />
-    <label for="u_edit_new" class="hidden"><?php echo _("Edit") ?></label>
+    <input type="checkbox" id="u_edit_new_select" name="u_edit[||new_select]" />
+    <label for="u_edit_new_select" class="hidden"><?php echo _("Edit") ?></label>
   </td>
   <td align="center">
-    <input type="checkbox" id="u_delete_new" name="u_delete[||new_select]" />
-    <label for="u_delete_new" class="hidden"><?php echo _("Delete") ?></label>
+    <input type="checkbox" id="u_delete_new_select" name="u_delete[||new_select]" />
+    <label for="u_delete_new_select" class="hidden"><?php echo _("Delete") ?></label>
   </td>
   <td align="center">
-    <input type="checkbox" id="u_delegate_new" name="u_delegate[||new_select]" />
-    <label for="u_delegate_new" class="hidden"><?php echo _("Delegate") ?></label>
+    <input type="checkbox" id="u_delegate_new_select" name="u_delegate[||new_select]" />
+    <label for="u_delegate_new_select" class="hidden"><?php echo _("Delegate") ?></label>
   </td>
 </tr>
 <?php endif; ?>
@@ -255,28 +253,28 @@ foreach ($userList as $user) {
 <?php if ($auth->hasCapability('list') && isset($GLOBALS['conf']['auth']['list_users']) && $GLOBALS['conf']['auth']['list_users'] == 'both'): ?>
     <?php echo _("Or enter a user name:") ?>
 <?php endif; ?>
-    <label for="u_names_new" class="hidden"><?php echo _("User to add:") ?></label>
-    <input type="text" id="u_names_new" name="u_names[||new_input]" />
+    <label for="u_names_new_input" class="hidden"><?php echo _("User to add:") ?></label>
+    <input type="text" id="u_names_new_input" name="u_names[||new_input]" />
   </td>
   <td align="center">
-    <input type="checkbox" id="u_show_new" name="u_show[||new_input]" />
-    <label for="u_show_new" class="hidden"><?php echo _("Show") ?></label>
+    <input type="checkbox" id="u_show_new_input" name="u_show[||new_input]" />
+    <label for="u_show_new_input" class="hidden"><?php echo _("Show") ?></label>
   </td>
   <td align="center">
-    <input type="checkbox" id="u_read_new" name="u_read[||new_input]" />
-    <label for="u_read_new" class="hidden"><?php echo _("Read") ?></label>
+    <input type="checkbox" id="u_read_new_input" name="u_read[||new_input]" />
+    <label for="u_read_new_input" class="hidden"><?php echo _("Read") ?></label>
   </td>
   <td align="center">
-    <input type="checkbox" id="u_edit_new" name="u_edit[||new_input]" />
-    <label for="u_edit_new" class="hidden"><?php echo _("Edit") ?></label>
+    <input type="checkbox" id="u_edit_new_input" name="u_edit[||new_input]" />
+    <label for="u_edit_new_input" class="hidden"><?php echo _("Edit") ?></label>
   </td>
   <td align="center">
-    <input type="checkbox" id="u_delete_new" name="u_delete[||new_input]" />
-    <label for="u_delete_new" class="hidden"><?php echo _("Delete") ?></label>
+    <input type="checkbox" id="u_delete_new_input" name="u_delete[||new_input]" />
+    <label for="u_delete_new_input" class="hidden"><?php echo _("Delete") ?></label>
   </td>
   <td align="center">
-    <input type="checkbox" id="u_delegate_new" name="u_delegate[||new_input]" />
-    <label for="u_delegate_new" class="hidden"><?php echo _("Delegate") ?></label>
+    <input type="checkbox" id="u_delegate_new_input" name="u_delegate[||new_input]" />
+    <label for="u_delegate_new_input" class="hidden"><?php echo _("Delegate") ?></label>
   </td>
   <td>&nbsp;</td>
 </tr>
-- 
2.11.0