Move convertUsername() from horde/Auth to horde/Core

diff --git a/folks/account/resetpassword.php b/folks/account/resetpassword.php
index 764dfce..aa7a360 100644 (file)
--- a/folks/account/resetpassword.php
+++ b/folks/account/resetpassword.php
@@ -50,7 +50,7 @@ $form->setButtons(_("Continue"));
 // Get user security pass
 $user = Horde_Util::getFormData('username');
 if ($user) {
-    $u_prefs = Horde_Prefs::singleton($conf['prefs']['driver'], 'horde', Horde_Auth::convertUsername($user, true), '', null, false);
+    $u_prefs = Horde_Prefs::singleton($conf['prefs']['driver'], 'horde', $registry->convertUsername($user, true), '', null, false);
     $u_prefs->retrieve();
     $answer = $u_prefs->getValue('security_answer');
     $question = $u_prefs->getValue('security_question');

diff --git a/folks/lib/Folks.php b/folks/lib/Folks.php
index c2adba3..7d727ab 100644 (file)
--- a/folks/lib/Folks.php
+++ b/folks/lib/Folks.php
@@ -260,7 +260,7 @@ class Folks {
     static public function getUserEmail($user)
     {
         // We should always realy on registration data
-        // $prefs = Horde_Prefs::singleton($GLOBALS['conf']['prefs']['driver'], 'horde', Horde_Auth::convertUsername($user, true), '', null, false);
+        // $prefs = Horde_Prefs::singleton($GLOBALS['conf']['prefs']['driver'], 'horde', $registry->convertUsername($user, true), '', null, false);
         // $prefs->retrieve();
         // $email = $prefs->getValue('alternate_email') ? $prefs->getValue('alternate_email') : $prefs->getValue('from_addr');
 

diff --git a/folks/lib/Friends.php b/folks/lib/Friends.php
index 9657e4a..f217eca 100644 (file)
--- a/folks/lib/Friends.php
+++ b/folks/lib/Friends.php
@@ -143,7 +143,7 @@ class Folks_Friends {
             return (boolean)$GLOBALS['prefs']->getValue('friends_approval');
         }
 
-        $prefs = Horde_Prefs::singleton($GLOBALS['conf']['prefs']['driver'], 'folks', Horde_Auth::convertUsername($user, true), '', null, false);
+        $prefs = Horde_Prefs::singleton($GLOBALS['conf']['prefs']['driver'], 'folks', $registry->convertUsername($user, true), '', null, false);
         $prefs->retrieve();
 
         return (boolean)$prefs->getValue('friends_approval');

diff --git a/folks/perms.php b/folks/perms.php
index 4a7ba0d..4bc2a90 100644 (file)
--- a/folks/perms.php
+++ b/folks/perms.php
@@ -50,7 +50,7 @@ case 'editform':
 
         // Process owner and owner permissions.
         $old_owner = $share->get('owner');
-        $new_owner = Horde_Auth::convertUsername(Horde_Util::getFormData('owner', $old_owner), true);
+        $new_owner = $registry->convertUsername(Horde_Util::getFormData('owner', $old_owner), true);
         if ($old_owner !== $new_owner && !empty($new_owner)) {
             if ($old_owner != Horde_Auth::getAuth() && !$registry->isAdmin()) {
                 $notification->push(_("Only the owner or system administrator may change ownership or owner permissions for a share"), 'horde.error');
@@ -135,7 +135,7 @@ case 'editform':
 
         foreach ($u_names as $key => $user) {
             // Apply backend hooks
-            $user = Horde_Auth::convertUsername($user, true);
+            $user = $registry->convertUsername($user, true);
             // If the user is empty, or we've already set permissions
             // via the owner_ options, don't do anything here.
             if (empty($user) || $user == $new_owner) {

diff --git a/framework/Auth/lib/Horde/Auth.php b/framework/Auth/lib/Horde/Auth.php
index 13e9274..57214f4 100644 (file)
--- a/framework/Auth/lib/Horde/Auth.php
+++ b/framework/Auth/lib/Horde/Auth.php
@@ -612,25 +612,6 @@ class Horde_Auth
     }
 
     /**
-     * Converts an authentication username to a unique Horde username.
-     *
-     * @param string $username  The username to convert.
-     * @param boolean $toHorde  If true, convert to a Horde username. If
-     *                          false, convert to the auth username.
-     *
-     * @return string  The converted username.
-     * @throws Horde_Exception
-     */
-    static public function convertUsername($userId, $toHorde)
-    {
-        try {
-            return Horde::callHook('authusername', array($userId, $toHorde));
-        } catch (Horde_Exception_HookNotSet $e) {
-            return $userId;
-        }
-    }
-
-    /**
      * Runs the pre/post-authenticate hook and parses the result.
      *
      * @param string $userId      The userId who has been authorized.

diff --git a/framework/Auth/package.xml b/framework/Auth/package.xml
index 6bd59dd..e587514 100644 (file)
--- a/framework/Auth/package.xml
+++ b/framework/Auth/package.xml
@@ -32,8 +32,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <license uri="http://opensource.org/licenses/lgpl-2.1.php">LGPL</license>
  <notes>* Removed Krb5 driver.
  * Moved signup code to horde/Core.
- * Replaced Horde_Auth::addHook() and Horde_Auth::removeHook() with
- Horde_Auth::convertUsername().
  * Add ability to retrieve app-specific credentials via
  Horde_Auth::getCredential().
  * Add Horde_Auth::getOriginalAuth().

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index ea7e839..9687267 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -1784,4 +1784,23 @@ class Horde_Registry
         return Horde::getServiceLink('login', 'horde')->add($params)->setRaw(true);
     }
 
+    /**
+     * Converts an authentication username to a unique Horde username.
+     *
+     * @param string $username  The username to convert.
+     * @param boolean $toHorde  If true, convert to a Horde username. If
+     *                          false, convert to the auth username.
+     *
+     * @return string  The converted username.
+     * @throws Horde_Exception
+     */
+    public function convertUsername($userId, $toHorde)
+    {
+        try {
+            return Horde::callHook('authusername', array($userId, $toHorde));
+        } catch (Horde_Exception_HookNotSet $e) {
+            return $userId;
+        }
+    }
+
 }

diff --git a/horde/services/portal/index.php b/horde/services/portal/index.php
index 1d52252..81395b7 100644 (file)
--- a/horde/services/portal/index.php
+++ b/horde/services/portal/index.php
@@ -15,7 +15,7 @@ Horde_Registry::appInit('horde');
 $identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity();
 $fullname = $identity->getValue('fullname');
 if (empty($fullname)) {
-    $fullname = Horde_Auth::convertUsername(Horde_Auth::getAuth(), false);
+    $fullname = $registry->convertUsername(Horde_Auth::getAuth(), false);
 }
 
 // Get refresh interval.

diff --git a/horde/services/shares/edit.php b/horde/services/shares/edit.php
index e3b9133..7a96b05 100644 (file)
--- a/horde/services/shares/edit.php
+++ b/horde/services/shares/edit.php
@@ -82,7 +82,7 @@ case 'editform':
         // Process owner and owner permissions.
         $old_owner = $share->get('owner');
         $new_owner_backend = Horde_Util::getFormData('owner_select', Horde_Util::getFormData('owner_input', $old_owner));
-        $new_owner = Horde_Auth::convertUsername($new_owner_backend, true);
+        $new_owner = $registry->convertUsername($new_owner_backend, true);
         if ($old_owner !== $new_owner && !empty($new_owner)) {
             if ($old_owner != Horde_Auth::getAuth() && !$registry->isAdmin()) {
                 $notification->push(_("Only the owner or system administrator may change ownership or owner permissions for a share"), 'horde.error');
@@ -172,7 +172,7 @@ case 'editform':
 
         foreach ($u_names as $key => $user_backend) {
             // Apply backend hooks
-            $user = Horde_Auth::convertUsername($user_backend, true);
+            $user = $registry->convertUsername($user_backend, true);
             // If the user is empty, or we've already set permissions
             // via the owner_ options, don't do anything here.
             if (empty($user) || $user == $new_owner) {

diff --git a/horde/templates/shares/edit.inc b/horde/templates/shares/edit.inc
index 772b14b..19aa853 100644 (file)
--- a/horde/templates/shares/edit.inc
+++ b/horde/templates/shares/edit.inc
@@ -38,14 +38,14 @@ if (isset($userperms[$owner])) {
     <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::convertUsername($owner, false)) ?>" selected="selected"><?php echo htmlspecialchars(Horde_Auth::convertUsername($owner, false)) ?></option>
-<?php foreach ($userList as $user) { if ($user != Horde_Auth::convertUsername($owner, false)) { ?>
-      <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars(Horde_Auth::convertUsername($user, false)) ?></option>
+      <option value="<?php echo htmlspecialchars($registry->convertUsername($owner, false)) ?>" selected="selected"><?php echo htmlspecialchars($registry->convertUsername($owner, false)) ?></option>
+<?php foreach ($userList as $user) { if ($user != $registry->convertUsername($owner, false)) { ?>
+      <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars($registry->convertUsername($user, false)) ?></option>
 <?php } } ?>
     </select>
 <?php else: ?>
     <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::convertUsername($owner, false)) ?>" />
+    <input type="text" id="owner_input" name="owner_input" value="<?php echo htmlspecialchars($registry->convertUsername($owner, false)) ?>" />
 <?php endif; ?>
   </td>
 </tr>
@@ -174,7 +174,7 @@ if (isset($userperms[$owner])) {
 <?php
 foreach ($userperms as $user => $uperm) {
     if ($user != $owner) {
-        $user = Horde_Auth::convertUsername($user, false);
+        $user = $registry->convertUsername($user, false);
 ?>
 <tr>
   <td class="light"><?php echo htmlspecialchars($user) ?><input type="hidden" name="u_names[<?php echo htmlspecialchars($user) ?>]" value="<?php echo htmlspecialchars($user) ?>" /></td>
@@ -206,8 +206,8 @@ foreach ($userperms as $user => $uperm) {
       <option value=""><?php echo _("Select a user to add:") ?></option>
 <?php
 foreach ($userList as $user) {
-    if (!isset($userperms[Horde_Auth::convertUsername($user, true)]) &&
-        $user != Horde_Auth::convertUsername($owner, false)) {
+    if (!isset($userperms[$registry->convertUsername($user, true)]) &&
+        $user != $registry->convertUsername($owner, false)) {
 ?>
       <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars($user) ?></option>
 <?php } } ?>

diff --git a/kronolith/lib/Ajax/Application.php b/kronolith/lib/Ajax/Application.php
index 20e342a..1065f96 100644 (file)
--- a/kronolith/lib/Ajax/Application.php
+++ b/kronolith/lib/Ajax/Application.php
@@ -717,7 +717,7 @@ class Kronolith_Ajax_Application extends Horde_Ajax_Application_Base
         $calendar = $GLOBALS['all_calendars'][$this->_vars->cal];
         $tagger = Kronolith::getTagger();
         $result->calendar = array(
-            'name' => (!$calendar->get('owner') ? '' : '[' . Horde_Auth::convertUsername($calendar->get('owner'), false) . '] ') . $calendar->get('name'),
+            'name' => (!$calendar->get('owner') ? '' : '[' . $GLOBALS['registry']->convertUsername($calendar->get('owner'), false) . '] ') . $calendar->get('name'),
             'desc' => $calendar->get('desc'),
             'owner' => false,
             'fg' => Kronolith::foregroundColor($calendar),

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 81559fc..157f20a 100644 (file)
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -255,7 +255,7 @@ class Kronolith
                     $calendar->get('owner') == Horde_Auth::getAuth();
                 if (($my && $owner) || (!$my && !$owner)) {
                     $code['conf']['calendars']['internal'][$id] = array(
-                        'name' => ($owner || !$calendar->get('owner') ? '' : '[' . Horde_Auth::convertUsername($calendar->get('owner'), false) . '] ')
+                        'name' => ($owner || !$calendar->get('owner') ? '' : '[' . $GLOBALS['registry']->convertUsername($calendar->get('owner'), false) . '] ')
                             . $calendar->get('name'),
                         'desc' => $calendar->get('desc'),
                         'owner' => $owner,
@@ -284,7 +284,7 @@ class Kronolith
                     $tasklist->get('owner') == Horde_Auth::getAuth();
                 if (($my && $owner) || (!$my && !$owner)) {
                     $code['conf']['calendars']['tasklists']['tasks/' . $id] = array(
-                        'name' => ($owner || !$tasklist->get('owner') ? '' : '[' . Horde_Auth::convertUsername($tasklist->get('owner'), false) . '] ')
+                        'name' => ($owner || !$tasklist->get('owner') ? '' : '[' . $GLOBALS['registry']->convertUsername($tasklist->get('owner'), false) . '] ')
                             . $tasklist->get('name'),
                         'desc' => $tasklist->get('desc'),
                         'owner' => $owner,
@@ -1611,7 +1611,7 @@ class Kronolith
         // Process owner and owner permissions.
         $old_owner = $share->get('owner');
         $new_owner_backend = Horde_Util::getFormData('owner_select', Horde_Util::getFormData('owner_input', $old_owner));
-        $new_owner = Horde_Auth::convertUsername($new_owner_backend, true);
+        $new_owner = $GLOBALS['registry']->convertUsername($new_owner_backend, true);
         if ($old_owner !== $new_owner && !empty($new_owner)) {
             if ($old_owner != Horde_Auth::getAuth() && !$GLOBALS['registry']->isAdmin()) {
                 $errors[] = _("Only the owner or system administrator may change ownership or owner permissions for a share");
@@ -1740,7 +1740,7 @@ class Kronolith
         $perm->removeUserPermission(null, null, false);
         foreach ($u_names as $key => $user_backend) {
             // Apply backend hooks
-            $user = Horde_Auth::convertUsername($user_backend, true);
+            $user = $GLOBALS['registry']->convertUsername($user_backend, true);
             // If the user is empty, or we've already set permissions
             // via the owner_ options, don't do anything here.
             if (empty($user) || $user == $new_owner) {

diff --git a/kronolith/templates/panel.inc b/kronolith/templates/panel.inc
index 4023f29..39420fe 100644 (file)
--- a/kronolith/templates/panel.inc
+++ b/kronolith/templates/panel.inc
@@ -127,7 +127,7 @@ $ta->attach();
  <h4><?php echo _("Shared Calendars:") ?></h4>
  <ul id="sharedcalendars">
 <?php foreach ($shared_calendars as $id => $cal): ?>
-   <li<?php echo Kronolith::getCSSColors($cal) ?>><label><input type="checkbox" class="checkbox" name="display_cal[]" value="<?php echo htmlspecialchars($id) ?>"<?php echo (in_array($id, $display_calendars) ? ' checked="checked"' : '') . ' /> ' . ($cal->get('owner') ? '[' . htmlspecialchars(Horde_Auth::convertUsername($cal->get('owner'), false)) . '] ' : '') . htmlspecialchars($cal->get('name')) ?></label> <?php echo $info_img ?></li>
+   <li<?php echo Kronolith::getCSSColors($cal) ?>><label><input type="checkbox" class="checkbox" name="display_cal[]" value="<?php echo htmlspecialchars($id) ?>"<?php echo (in_array($id, $display_calendars) ? ' checked="checked"' : '') . ' /> ' . ($cal->get('owner') ? '[' . htmlspecialchars($GLOBALS['registry']->convertUsername($cal->get('owner'), false)) . '] ' : '') . htmlspecialchars($cal->get('name')) ?></label> <?php echo $info_img ?></li>
 <?php endforeach; ?>
  </ul>
 <?php endif; ?>

diff --git a/kronolith/templates/perms/perms.inc b/kronolith/templates/perms/perms.inc
index ffc7ea4..a2ea972 100644 (file)
--- a/kronolith/templates/perms/perms.inc
+++ b/kronolith/templates/perms/perms.inc
@@ -28,14 +28,14 @@
     <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::convertUsername($owner, false)) ?>" selected="selected"><?php echo htmlspecialchars(Horde_Auth::convertUsername($owner, false)) ?></option>
-<?php foreach ($userList as $user) { if ($user != Horde_Auth::convertUsername($owner, false)) { ?>
+      <option value="<?php echo htmlspecialchars($registry->convertUsername($owner, false)) ?>" selected="selected"><?php echo htmlspecialchars($registry->convertUsername($owner, false)) ?></option>
+<?php foreach ($userList as $user) { if ($user != $registry->convertUsername($owner, false)) { ?>
       <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars($user) ?></option>
 <?php } } ?>
     </select>
 <?php else: ?>
     <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::convertUsername($owner, false)) ?>" />
+    <input type="text" id="owner_input" name="owner_input" value="<?php echo htmlspecialchars($registry->convertUsername($owner, false)) ?>" />
 <?php endif; ?>
   </td>
 </tr>
@@ -183,7 +183,7 @@
 <?php
 foreach ($userperms as $user => $uperm) {
     if ($user != $owner) {
-        $user = Horde_Auth::convertUsername($user, false);
+        $user = $registry->convertUsername($user, false);
 ?>
 <tr>
   <td class="light"><?php echo htmlspecialchars($user) ?><input type="hidden" name="u_names[<?php echo htmlspecialchars($user) ?>]" value="<?php echo htmlspecialchars($user) ?>" /></td>
@@ -220,8 +220,8 @@ foreach ($userperms as $user => $uperm) {
       <option value=""><?php echo _("Select a user to add:") ?></option>
 <?php
 foreach ($userList as $user) {
-    if (!isset($userperms[Horde_Auth::convertUsername($user, true)]) &&
-        $user != Horde_Auth::convertUsername($owner, false)) {
+    if (!isset($userperms[$registry->convertUsername($user, true)]) &&
+        $user != $registry->convertUsername($owner, false)) {
 ?>
       <option value="<?php echo htmlspecialchars($user) ?>"><?php echo htmlspecialchars($user) ?></option>
 <?php } } ?>

diff --git a/nag/templates/panel.inc b/nag/templates/panel.inc
index 1b430b7..399dd14 100644 (file)
--- a/nag/templates/panel.inc
+++ b/nag/templates/panel.inc
@@ -85,7 +85,7 @@ document.observe('dom:loaded', function() {
  <h4><?php echo _("Shared Task Lists:") ?></h4>
  <ul id="sharedtasklists">
 <?php foreach ($shared_tasklists as $id => $tl): ?>
-   <li><label><input type="checkbox" class="checkbox" name="display_tasklist[]" value="<?php echo htmlspecialchars($id) ?>"<?php echo (in_array($id, $display_tasklists) ? ' checked="checked"' : '') . ' /> ' . ($tl->get('owner') ? '[' . htmlspecialchars(Horde_Auth::convertUsername($tl->get('owner'), false)) . '] ' : '') . htmlspecialchars($tl->get('name')) ?></label> <?php echo $info_img ?></li>
+   <li><label><input type="checkbox" class="checkbox" name="display_tasklist[]" value="<?php echo htmlspecialchars($id) ?>"<?php echo (in_array($id, $display_tasklists) ? ' checked="checked"' : '') . ' /> ' . ($tl->get('owner') ? '[' . htmlspecialchars($registry->convertUsername($tl->get('owner'), false)) . '] ' : '') . htmlspecialchars($tl->get('name')) ?></label> <?php echo $info_img ?></li>
 <?php endforeach; ?>
  </ul>
 <?php endif; ?>

diff --git a/skoli/templates/panel.inc b/skoli/templates/panel.inc
index ead9ed5..31133b9 100644 (file)
--- a/skoli/templates/panel.inc
+++ b/skoli/templates/panel.inc
@@ -62,7 +62,7 @@ function sbarToggle()
  <h4><?php echo _("Shared Classes:") ?></h4>
  <ul id="sharedclasses">
 <?php foreach ($shared_classes as $id => $cl): ?>
-   <li><label><input type="checkbox" class="checkbox" name="display_class[]" value="<?php echo htmlspecialchars($id) ?>"<?php echo (in_array($id, $display_classes) ? ' checked="checked"' : '') . ' /> ' . ($cl->get('owner') ? '[' . htmlspecialchars(Horde_Auth::convertUsername($cl->get('owner'), false)) . '] ' : '') . htmlspecialchars($cl->get('name')) ?></label></li>
+   <li><label><input type="checkbox" class="checkbox" name="display_class[]" value="<?php echo htmlspecialchars($id) ?>"<?php echo (in_array($id, $display_classes) ? ' checked="checked"' : '') . ' /> ' . ($cl->get('owner') ? '[' . htmlspecialchars($registry->convertUsername($cl->get('owner'), false)) . '] ' : '') . htmlspecialchars($cl->get('name')) ?></label></li>
 <?php endforeach; ?>
  </ul>
 <?php endif; ?>