From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 30 Jul 2010 07:47:44 +0000 (-0600)
Subject: Better random string generation.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=79bf8f469ae19a69c1de18c50528aeb89eeef24a;p=horde.git

Better random string generation.

Use either Horde_Support_Uuid or uniqid(mt_rand()) (the former is more
random and should be used for things like persistent data; the latter is
useful for things like cache-busting).
---

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index f1acedbd9..fa0dc15fd 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -999,7 +999,7 @@ class Ansel
     static public function embedCode($options)
     {
         if (empty($options['container'])) {
-            $domid = md5(uniqid());
+            $domid = uniqid();
             $options['container'] = $domid;
         } else {
             $domid = $options['container'];
diff --git a/ansel/xppublish.php b/ansel/xppublish.php
index 7bc9a5a8f..975b63da8 100644
--- a/ansel/xppublish.php
+++ b/ansel/xppublish.php
@@ -122,10 +122,10 @@ if ($cmd == 'new') {
         } catch (Ansel_Exception $e) {
             $error = sprintf(_("The gallery \"%s\" couldn't be created: %s"), $gallery_name, $e->getMessage());
             Horde::logMessage($error, 'ERR');
-        } 
+        }
     } else {
         if (empty($galleryId) && $prefs->getValue('autoname')) {
-            $galleryId = md5(microtime());
+            $galleryId = strval(new Horde_Support_Uuid());
         }
         if (!$gallery_name) {
             $gallery_name = _("Untitled");
diff --git a/fima/lib/Driver/sql.php b/fima/lib/Driver/sql.php
index 9524b8a44..23dc94ffc 100644
--- a/fima/lib/Driver/sql.php
+++ b/fima/lib/Driver/sql.php
@@ -520,7 +520,7 @@ class Fima_Driver_sql extends Fima_Driver {
      */
     function _addAccount($number, $type, $name, $eo, $desc, $closed)
     {
-        $accountId = md5(uniqid(mt_rand(), true));
+        $accountId = strval(new Horde_Support_Uuid());
 
         $query = sprintf(
             'INSERT INTO %s (account_id, account_owner, account_number, account_type, ' .
@@ -706,7 +706,7 @@ class Fima_Driver_sql extends Fima_Driver {
      */
     function _addPosting($type, $date, $asset, $account, $eo, $amount, $desc)
     {
-        $postingId = md5(uniqid(mt_rand(), true));
+        $postingId = strval(new Horde_Support_Uuid());
 
         $query = sprintf(
             'INSERT INTO %s (posting_id, posting_owner, posting_type, posting_date, ' .
diff --git a/fima/lib/Forms/CreateLedger.php b/fima/lib/Forms/CreateLedger.php
index dbdd60edf..ad50492a7 100644
--- a/fima/lib/Forms/CreateLedger.php
+++ b/fima/lib/Forms/CreateLedger.php
@@ -36,7 +36,7 @@ class Fima_CreateLedgerForm extends Horde_Form {
     function execute()
     {
         // Create new share.
-        $ledger = $GLOBALS['fima_shares']->newShare(md5(microtime()));
+        $ledger = $GLOBALS['fima_shares']->newShare(strval(new Horde_Support_Uuid()));
         if (is_a($ledger, 'PEAR_Error')) {
             return $ledger;
         }
diff --git a/folks/lib/Friends/shared.php b/folks/lib/Friends/shared.php
index 0002a982b..f7165e37a 100644
--- a/folks/lib/Friends/shared.php
+++ b/folks/lib/Friends/shared.php
@@ -145,6 +145,7 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
      * Add group
      *
      * @param string $group   Group name
+     * @throws Horde_Share_Exception
      */
     public function addGroup($name)
     {
@@ -159,16 +160,10 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
 
         $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Share')->getScope();
 
-        $share = $GLOBALS['folks_shares']->newShare(hash('md5', microtime()));
-        if ($share instanceof PEAR_Error) {
-            return $share;
-        }
+        $share = $GLOBALS['folks_shares']->newShare(strval(new Horde_Support_Uuid()));
 
         $share->set('name', $name);
         $result = $GLOBALS['folks_shares']->addShare($share);
-        if ($result instanceof PEAR_Error) {
-            return $result;
-        }
 
         return $share->getId();
     }
diff --git a/framework/Block/lib/Horde/Block/Layout/Manager.php b/framework/Block/lib/Horde/Block/Layout/Manager.php
index 60213354e..d42bc9ff0 100644
--- a/framework/Block/lib/Horde/Block/Layout/Manager.php
+++ b/framework/Block/lib/Horde/Block/Layout/Manager.php
@@ -293,8 +293,8 @@ class Horde_Block_Layout_Manager extends Horde_Block_Layout
         }
 
         if (!empty($url)) {
-            header('Location: ' . Horde_Util::addParameter($url, 'unique',
-                                                     md5(microtime()), false));
+            $url = new Horde_Url($url);
+            header('Location: ' . strval($url->unique()->setRaw(true)));
         }
     }
 
diff --git a/framework/Core/lib/Horde/Config.php b/framework/Core/lib/Horde/Config.php
index 6c93060ba..a01d1b974 100644
--- a/framework/Core/lib/Horde/Config.php
+++ b/framework/Core/lib/Horde/Config.php
@@ -426,7 +426,7 @@ class Horde_Config
             switch ($node->tagName) {
             case 'configdescription':
                 if (empty($name)) {
-                    $name = hash('md5', uniqid(mt_rand(), true));
+                    $name = uniqid(mt_rand());
                 }
 
                 $conf[$name] = array(
@@ -437,7 +437,7 @@ class Horde_Config
 
             case 'configheader':
                 if (empty($name)) {
-                    $name = hash('md5', uniqid(mt_rand(), true));
+                    $name = uniqid(mt_rand());
                 }
 
                 $conf[$name] = array(
@@ -603,7 +603,7 @@ class Horde_Config
                     '_type' => 'text',
                     'required' => true,
                     'desc' => $desc,
-                    'default' => $this->_default($curctx, sha1(uniqid(mt_rand(), true))),
+                    'default' => $this->_default($curctx, strval(new Horde_Support_Uuid())),
                     'is_default' => $this->_isDefault($curctx, $this->_getNodeOnlyText($node))
                 );
                 break;
@@ -625,7 +625,7 @@ class Horde_Config
                 break;
 
             case 'configtab':
-                $key = hash('md5', uniqid(mt_rand(), true));
+                $key = uniqid(mt_rand());
 
                 $conf[$key] = array(
                     'tab' => $name,
@@ -638,7 +638,7 @@ class Horde_Config
                 break;
 
             case 'configplaceholder':
-                $conf[hash('md5', uniqid(mt_rand(), true))] = 'placeholder';
+                $conf[uniqid(mt_rand())] = 'placeholder';
                 break;
 
             default:
diff --git a/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php b/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php
index 2c36973e7..034b074b2 100644
--- a/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php
+++ b/framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php
@@ -923,7 +923,7 @@ EOT;
     {
         $varname = $var->getVarName();
         $varvalue = $vars->get($varname);
-        $fieldId = $this->_genID(md5(uniqid(rand(), true)), false) . 'id';
+        $fieldId = $this->_genID(uniqid(mt_rand()), false) . 'id';
         $html = '
             <script type="text/javascript">
             var obrowserWindowName;
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 301d4dc00..ea387028b 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -290,6 +290,10 @@ Application Framework.</description>
     <channel>pear.horde.org</channel>
    </package>
    <package>
+    <name>Support</name>
+    <channel>pear.horde.org</channel>
+   </package>
+   <package>
     <name>Url</name>
     <channel>pear.horde.org</channel>
    </package>
diff --git a/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php b/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php
index 9db8f9252..319582666 100644
--- a/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php
+++ b/framework/Model/lib/Horde/Form/VarRenderer/Xhtml.php
@@ -728,7 +728,7 @@ EOT;
     {
         $varname = $var->getVarName();
         $varvalue = $vars->get($varname);
-        $fieldId = 'obrowser_' . hash('md5', uniqid(rand(), true));
+        $fieldId = 'obrowser_' . uniqid(mt_rand());
         $html = '
             <script type="text/javascript">
             var obrowserWindowName;
diff --git a/framework/Prefs/lib/Horde/Prefs/Identity.php b/framework/Prefs/lib/Horde/Prefs/Identity.php
index feb49f4c5..90475d131 100644
--- a/framework/Prefs/lib/Horde/Prefs/Identity.php
+++ b/framework/Prefs/lib/Horde/Prefs/Identity.php
@@ -402,7 +402,7 @@ class Horde_Prefs_Identity
     {
         global $conf;
 
-        $hash = base_convert(microtime() . mt_rand(), 10, 36);
+        $hash = base_convert(strval(new Horde_Support_Uuid()), 10, 36);
 
         $pref = @unserialize($this->_prefs->getValue('confirm_email', false));
         $pref = $pref
diff --git a/framework/Rpc/lib/Horde/Rpc/Webdav.php b/framework/Rpc/lib/Horde/Rpc/Webdav.php
index fed5be82f..a9f533dc3 100644
--- a/framework/Rpc/lib/Horde/Rpc/Webdav.php
+++ b/framework/Rpc/lib/Horde/Rpc/Webdav.php
@@ -1844,7 +1844,7 @@ class Horde_Rpc_Webdav extends Horde_Rpc
 
                 // a little naive, this sequence *might* be part of the content
                 // but it's really not likely and rather expensive to check
-                $this->multipart_separator = "SEPARATOR_".md5(microtime());
+                $this->multipart_separator = "SEPARATOR_" . uniqid(mt_rand());
 
                 // generate HTTP header
                 header("Content-type: multipart/byteranges; boundary=".$this->multipart_separator);
diff --git a/framework/Secret/lib/Horde/Secret.php b/framework/Secret/lib/Horde/Secret.php
index 41f400aba..4cfc3e2df 100644
--- a/framework/Secret/lib/Horde/Secret.php
+++ b/framework/Secret/lib/Horde/Secret.php
@@ -145,7 +145,7 @@ class Horde_Secret
                 $key = $_COOKIE[$keyname . '_key'];
                 $set = false;
             } else {
-                $key = $_COOKIE[$keyname . '_key'] = hash('md5', uniqid());
+                $key = $_COOKIE[$keyname . '_key'] = uniqid(mt_rand());
             }
         } else {
             $key = session_id();
diff --git a/framework/SyncML/SyncML/Backend/Sql.php b/framework/SyncML/SyncML/Backend/Sql.php
index f190a7f6d..927005055 100644
--- a/framework/SyncML/SyncML/Backend/Sql.php
+++ b/framework/SyncML/SyncML/Backend/Sql.php
@@ -305,7 +305,7 @@ class SyncML_Backend_Sql extends SyncML_Backend {
 
         // Generate an id (suid). It's also possible to use a database
         // generated primary key here.
-        $suid = $this->_generateID();
+        $suid = strval(new Horde_Support_Uuid());
         $created_ts = $this->getCurrentTimeStamp();
 
         $r = $this->_db->exec(
@@ -803,25 +803,6 @@ class SyncML_Backend_Sql extends SyncML_Backend {
     }
 
     /**
-     * Generates a unique ID used as suid
-     *
-     * @return string  A unique ID.
-     */
-    function _generateID()
-    {
-        return date('YmdHis') . '.'
-            . substr(str_pad(base_convert(microtime(), 10, 36),
-                             16,
-                             uniqid(mt_rand()),
-                             STR_PAD_LEFT),
-                     -16)
-            . '@'
-            . (!empty($_SERVER['SERVER_NAME'])
-               ? $_SERVER['SERVER_NAME']
-               : 'localhost');
-    }
-
-    /**
      * Checks if the parameter is a PEAR_Error object and if so logs the
      * error.
      *
@@ -1040,7 +1021,7 @@ class SyncML_Backend_Sql extends SyncML_Backend {
 
         // Generate an id (suid). It's also possible to use a database
         // generated primary key here. */
-        $suid = $this->_generateID();
+        $suid = strval(new Horde_Support_Uuid());
 
         $created_ts = $this->getCurrentTimeStamp();
         $r = $this->_db->exec(
diff --git a/framework/SyncML/package.xml b/framework/SyncML/package.xml
index b76c51696..b6cfdbcc8 100644
--- a/framework/SyncML/package.xml
+++ b/framework/SyncML/package.xml
@@ -85,6 +85,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <min>1.4.0b1</min>
    </pearinstaller>
    <package>
+    <name>Support</name>
+    <channel>pear.horde.org</channel>
+   </package>
+   <package>
     <name>XML_WBXML</name>
     <channel>pear.horde.org</channel>
    </package>
diff --git a/framework/Token/lib/Horde/Token.php b/framework/Token/lib/Horde/Token.php
index 85df078a1..9fd829ddd 100644
--- a/framework/Token/lib/Horde/Token.php
+++ b/framework/Token/lib/Horde/Token.php
@@ -57,7 +57,7 @@ class Horde_Token
      */
     static public function generateId($seed = '')
     {
-        return Horde_Url::uriB64Encode(pack('H*', sha1(uniqid(mt_rand(), true) . $seed . (isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : ''))));
+        return Horde_Url::uriB64Encode(pack('H*', hash('sha1', uniqid(mt_rand()) . $seed . (isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : ''))));
     }
 
 }
diff --git a/framework/Util/lib/Horde/Util.php b/framework/Util/lib/Horde/Util.php
index a4a48c695..1606cd5d9 100644
--- a/framework/Util/lib/Horde/Util.php
+++ b/framework/Util/lib/Horde/Util.php
@@ -440,7 +440,7 @@ class Horde_Util
         /* Get the first 8 characters of a random string to use as a temporary
            directory name. */
         do {
-            $new_dir = $temp_dir . '/' . substr(base_convert(mt_rand() . microtime(), 10, 36), 0, 8);
+            $new_dir = $temp_dir . '/' . substr(base_convert(uniqid(mt_rand()), 10, 36), 0, 8);
         } while (file_exists($new_dir));
 
         $old_umask = umask(0000);
diff --git a/framework/iCalendar/iCalendar/vevent.php b/framework/iCalendar/iCalendar/vevent.php
index b1c4bbf64..3043c82a7 100644
--- a/framework/iCalendar/iCalendar/vevent.php
+++ b/framework/iCalendar/iCalendar/vevent.php
@@ -24,9 +24,7 @@ class Horde_iCalendar_vevent extends Horde_iCalendar {
         // Default values.
         $requiredAttributes = array();
         $requiredAttributes['DTSTAMP'] = time();
-        $requiredAttributes['UID'] = $this->_exportDateTime(time())
-            . substr(str_pad(base_convert(microtime(), 10, 36), 16, uniqid(mt_rand()), STR_PAD_LEFT), -16)
-            . '@' . (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost');
+        $requiredAttributes['UID'] = strval(new Horde_Support_Uuid());
 
         $method = !empty($this->_container) ?
             $this->_container->getAttribute('METHOD') : 'PUBLISH';
diff --git a/framework/iCalendar/package.xml b/framework/iCalendar/package.xml
index edda95d7e..dd19af553 100644
--- a/framework/iCalendar/package.xml
+++ b/framework/iCalendar/package.xml
@@ -109,6 +109,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <channel>pear.horde.org</channel>
    </package>
    <package>
+    <name>Support</name>
+    <channel>pear.horde.org</channel>
+   </package>
+   <package>
     <name>Util</name>
     <channel>pear.horde.org</channel>
    </package>
diff --git a/gollem/lib/Api.php b/gollem/lib/Api.php
index 7e76b3508..b5c3abe32 100644
--- a/gollem/lib/Api.php
+++ b/gollem/lib/Api.php
@@ -478,7 +478,7 @@ class Gollem_Api extends Horde_Registry_Api
     public function setSelectlist($selectid = '', $files = array())
     {
         if (empty($selectid)) {
-            $selectid = uniqid(mt_rand(), true);
+            $selectid = uniqid(mt_rand());
         }
 
         if (count($files) > 0) {
diff --git a/gollem/selectlist.php b/gollem/selectlist.php
index e97d3c268..e42af753b 100644
--- a/gollem/selectlist.php
+++ b/gollem/selectlist.php
@@ -20,7 +20,7 @@ $currdir = Gollem::getDir();
 /* Create a new cache ID if one does not already exist. */
 $cacheid = Horde_Util::getFormData('cacheid');
 if (empty($cacheid)) {
-    $cacheid = uniqid(mt_rand(), true);
+    $cacheid = uniqid(mt_rand());
     $_SESSION['gollem']['selectlist'][$cacheid] = array();
 }
 
diff --git a/horde/admin/alarms.php b/horde/admin/alarms.php
index a6f50e2e0..b3219f2fa 100644
--- a/horde/admin/alarms.php
+++ b/horde/admin/alarms.php
@@ -40,9 +40,7 @@ foreach ($horde_alarm->handlers() as $name => $method) {
 if ($form->validate()) {
     $form->getInfo($vars, $info);
     if (empty($info['alarm'])) {
-        $info['alarm'] = date('YmdHis') . '.'
-            . substr(str_pad(base_convert(microtime(), 10, 36), 16, uniqid(mt_rand()), STR_PAD_LEFT), -16)
-            . '@' . $GLOBALS['conf']['server']['name'];
+        $info['alarm'] = strval(new Horde_Support_Uuid());
     }
 
     $params = array();
diff --git a/horde/templates/contents/open_view_win.js b/horde/templates/contents/open_view_win.js
index e0b4eb560..a421c57dd 100644
--- a/horde/templates/contents/open_view_win.js
+++ b/horde/templates/contents/open_view_win.js
@@ -20,7 +20,7 @@ function tr(badval)
 function view(url, partid)
 {
     param = "menubar=yes,toolbar=no,location=no,status=no,scrollbars=yes,resizable=yes";
-    window.open(url, '<?php echo base_convert(microtime(), 10, 36) ?>' + tr(partid), param);
+    window.open(url, '<?php echo uniqid() ?>' + tr(partid), param);
 }
 
 // -->
diff --git a/hylax/lib/Driver/spandsp.php b/hylax/lib/Driver/spandsp.php
index 842b9d2b0..a0fbbb4b4 100644
--- a/hylax/lib/Driver/spandsp.php
+++ b/hylax/lib/Driver/spandsp.php
@@ -47,7 +47,7 @@ class Hylax_Driver_spandsp extends Hylax_Driver {
         $data .= sprintf("Application: %s\n", 'txfax');
         $data .= sprintf("Data: %s|caller\n", $filename);
 
-        $outfile = sprintf("%s/%s.call", $conf['fax']['params']['outgoing'], md5(microtime()));
+        $outfile = sprintf("%s/%s.call", $conf['fax']['params']['outgoing'], strval(new Horde_Support_Uuid()));
         if ($fh = fopen($outfile, "w")) {
             fwrite($fh, $data);
             fclose($fh);
diff --git a/imp/attachment.php b/imp/attachment.php
index 444895523..af290d8ce 100644
--- a/imp/attachment.php
+++ b/imp/attachment.php
@@ -67,7 +67,7 @@ if ($conf['compose']['link_attachments_notify']) {
         }
     } else {
         /* Create a random identifier for this file. */
-        $id = uniqid(mt_rand());
+        $id = strval(new Horde_Support_Uuid());
         try {
             $vfsroot->writeData($full_path, $file_name . '.notify', $id, true);
 
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index f03b6805b..6ac3d0f9b 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -1943,7 +1943,7 @@ class IMP_Compose
         if ($GLOBALS['conf']['compose']['use_vfs']) {
             try {
                 $vfs = $GLOBALS['injector']->getInstance('Horde_Vfs')->getVfs();
-                $cacheID = uniqid(mt_rand());
+                $cacheID = strval(new Horde_Support_Uuid());
 
                 if ($vfs_file) {
                     $vfs->write(self::VFS_ATTACH_PATH, $cacheID, $data, true);
diff --git a/imp/lib/Injector/Binder/Imaptree.php b/imp/lib/Injector/Binder/Imaptree.php
index db0ab5b9c..6948da0b5 100644
--- a/imp/lib/Injector/Binder/Imaptree.php
+++ b/imp/lib/Injector/Binder/Imaptree.php
@@ -25,7 +25,7 @@ class IMP_Injector_Binder_Imaptree implements Horde_Injector_Binder
 
         if (empty($_SESSION['imp']['cache']['tree'])) {
             if (!($cache instanceof Horde_Cache_Null)) {
-                $_SESSION['imp']['cache']['tree'] = uniqid(mt_rand() . $GLOBALS['registry']->getAuth());
+                $_SESSION['imp']['cache']['tree'] = strval(new Horde_Support_Uuid());
             }
         } else {
             $instance = @unserialize($cache->get($_SESSION['imp']['cache']['tree'], 86400));
diff --git a/ingo/config/backends.php.dist b/ingo/config/backends.php.dist
index 5b2702c97..4306b9272 100644
--- a/ingo/config/backends.php.dist
+++ b/ingo/config/backends.php.dist
@@ -241,7 +241,7 @@ $backends['sivtest'] = array(
         'command' => '/usr/bin/sivtest',
         // name of the socket we're using
         'socket' => Horde::getTempDir() . '/sivtest.'
-            . md5(uniqid(rand())) . '.sock',
+            . uniqid(mt_rand()) . '.sock',
     ),
     'script' => 'sieve',
     'scriptparams' => array(),
diff --git a/kronolith/lib/Driver/Sql.php b/kronolith/lib/Driver/Sql.php
index 5d0a07804..ead9b6a9e 100644
--- a/kronolith/lib/Driver/Sql.php
+++ b/kronolith/lib/Driver/Sql.php
@@ -607,7 +607,7 @@ class Kronolith_Driver_Sql extends Kronolith_Driver
         if ($event->id) {
             $id = $event->id;
         } else {
-            $id = hash('md5', uniqid(mt_rand(), true));
+            $id = strval(new Horde_Support_Uuid);
             $event->id = $id;
         }
 
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 0056a2688..0494eeba8 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -1561,7 +1561,7 @@ class Kronolith
     public static function addShare($info)
     {
         try {
-            $calendar = $GLOBALS['kronolith_shares']->newShare(hash('md5', microtime()));
+            $calendar = $GLOBALS['kronolith_shares']->newShare(strval(new Horde_String_Uuid()));
         } catch (Horde_Share_Exception $e) {
             throw new Kronolith_Exception($e);
         }
diff --git a/kronolith/lib/Resource.php b/kronolith/lib/Resource.php
index ea1c4b644..0199461b4 100644
--- a/kronolith/lib/Resource.php
+++ b/kronolith/lib/Resource.php
@@ -34,7 +34,7 @@ class Kronolith_Resource
     static public function addResource($resource)
     {
         // Create a new calendar id.
-        $calendar = 'resource_' . hash('md5', microtime());
+        $calendar = 'resource_' . uniqid(mt_rand());
         $resource->set('calendar', $calendar);
         $driver = Kronolith::getDriver('Resource');
 
@@ -57,4 +57,4 @@ class Kronolith_Resource
         return false;
     }
 
-}
\ No newline at end of file
+}
diff --git a/mnemo/lib/Driver.php b/mnemo/lib/Driver.php
index e81df7e58..524bc2d77 100644
--- a/mnemo/lib/Driver.php
+++ b/mnemo/lib/Driver.php
@@ -68,20 +68,6 @@ class Mnemo_Driver {
     }
 
     /**
-     * Generate a universal / unique identifier for a task. This is
-     * NOT something that we expect to be able to parse into a
-     * tasklist and a taskId.
-     *
-     * @return string  A nice unique string (should be 255 chars or less).
-     */
-    function generateUID()
-    {
-        return date('YmdHis') . '.'
-            . substr(str_pad(base_convert(microtime(), 10, 36), 16, uniqid(mt_rand()), STR_PAD_LEFT), -16)
-            . '@' . $GLOBALS['conf']['server']['name'];
-    }
-
-    /**
      * Update the description (short summary) of a memo.
      *
      * @param integer $memo_id  The memo to update.
diff --git a/mnemo/lib/Driver/kolab.php b/mnemo/lib/Driver/kolab.php
index 643f333f7..aa88ae669 100644
--- a/mnemo/lib/Driver/kolab.php
+++ b/mnemo/lib/Driver/kolab.php
@@ -351,7 +351,7 @@ class Mnemo_Driver_kolab_wrapper_old extends Mnemo_Driver_kolab_wrapper {
         if (isset($uid)) {
             $result = $this->_kolab->loadObject($uid);
         } else {
-            $uid = md5(uniqid(mt_rand(), true));
+            $uid = strval(new Horde_Support_Uuid());
             $result = $this->_kolab->newObject($uid);
         }
         if (is_a($result, 'PEAR_Error')) {
@@ -594,7 +594,7 @@ class Mnemo_Driver_kolab_wrapper_new extends Mnemo_Driver_kolab_wrapper {
     function _setObject($desc, $body, $category = '', $uid = null, $passphrase = null)
     {
         if (empty($uid)) {
-            $note_uid = $this->_store->generateUID();
+            $note_uid = strval(new Horde_Support_Uuid());
             $old_uid = null;
             $action = array('action' => 'add');
         } else {
diff --git a/mnemo/lib/Driver/sql.php b/mnemo/lib/Driver/sql.php
index f26629a5b..2cd775b80 100644
--- a/mnemo/lib/Driver/sql.php
+++ b/mnemo/lib/Driver/sql.php
@@ -214,7 +214,7 @@ class Mnemo_Driver_sql extends Mnemo_Driver {
      */
     function add($desc, $body, $category = '', $uid = null, $passphrase = null)
     {
-        $noteId = md5(uniqid(mt_rand(), true));
+        $noteId = strval(new Horde_Support_Uuid());
 
         if ($passphrase) {
             $body = $this->encrypt($body, $passphrase);
@@ -225,7 +225,7 @@ class Mnemo_Driver_sql extends Mnemo_Driver {
         }
 
         if (is_null($uid)) {
-            $uid = $this->generateUID();
+            $uid = strval(new Horde_Support_Uuid());
         }
 
         $query = 'INSERT INTO ' . $this->_params['table'] .
@@ -429,7 +429,7 @@ class Mnemo_Driver_sql extends Mnemo_Driver {
     {
         /* Make sure notes always have a UID. */
         if (empty($row['memo_uid'])) {
-            $row['memo_uid'] = $this->generateUID();
+            $row['memo_uid'] = strval(new Horde_Support_Uuid());
 
             $query = 'UPDATE ' . $this->_params['table'] .
                 ' SET memo_uid = ?' .
diff --git a/mnemo/lib/Forms/CreateNotepad.php b/mnemo/lib/Forms/CreateNotepad.php
index 79e164b20..8c48a506a 100644
--- a/mnemo/lib/Forms/CreateNotepad.php
+++ b/mnemo/lib/Forms/CreateNotepad.php
@@ -40,7 +40,7 @@ class Mnemo_CreateNotepadForm extends Horde_Form {
     {
         // Create new share.
         try {
-            $notepad = $GLOBALS['mnemo_shares']->newShare(md5(microtime()));
+            $notepad = $GLOBALS['mnemo_shares']->newShare(strval(new Horde_Support_Uuid()));
         } catch (Horde_Share_Exception $e) {
             Horde::logMessage($e->getMessage(), 'ERR');
             throw new Mnemo_Exception($e);
diff --git a/nag/lib/Driver.php b/nag/lib/Driver.php
index 69dfc0fc1..5e773111b 100644
--- a/nag/lib/Driver.php
+++ b/nag/lib/Driver.php
@@ -83,20 +83,6 @@ class Nag_Driver
     }
 
     /**
-     * Generate a universal / unique identifier for a task. This is
-     * NOT something that we expect to be able to parse into a
-     * tasklist and a taskId.
-     *
-     * @return string  A nice unique string (should be 255 chars or less).
-     */
-    function generateUID()
-    {
-        return date('YmdHis') . '.'
-            . substr(str_pad(base_convert(microtime(), 10, 36), 16, uniqid(mt_rand()), STR_PAD_LEFT), -16)
-            . '@' . $GLOBALS['conf']['server']['name'];
-    }
-
-    /**
      * Attempts to return a concrete Nag_Driver instance based on $driver.
      *
      * @param string    $tasklist   The name of the tasklist to load.
@@ -211,7 +197,7 @@ class Nag_Driver
                  $owner = null, $assignee = null)
     {
         if (is_null($uid)) {
-            $uid = $this->generateUID();
+            $uid = strval(new Horde_Support_Uuid());
         }
         if (is_null($owner)) {
             $owner = $GLOBALS['registry']->getAuth();
diff --git a/nag/lib/Driver/Kolab.php b/nag/lib/Driver/Kolab.php
index d6bcd28d7..035419bfd 100644
--- a/nag/lib/Driver/Kolab.php
+++ b/nag/lib/Driver/Kolab.php
@@ -436,7 +436,7 @@ class Nag_Driver_kolab_wrapper_old extends Nag_Driver_kolab_wrapper {
     {
         // Usually provided by the generic Driver class
         if ($uid !== null) {
-            $uid = $this->generateUID();
+            $uid = strval(new Horde_Support_Uuid());
         }
 
         // Load the object into the kolab driver
@@ -785,7 +785,7 @@ class Nag_Driver_kolab_wrapper_new extends Nag_Driver_kolab_wrapper {
                         $completed_date = null)
     {
         if (empty($uid)) {
-            $task_uid = $this->_store->generateUID();
+            $task_uid = strval(new Horde_Support_Uuid());
             $old_uid = null;
         } else {
             list($task_uid, $tasklist) = $this->_splitId($uid);
diff --git a/nag/lib/Driver/Sql.php b/nag/lib/Driver/Sql.php
index 6a1f2307f..b0f11853d 100644
--- a/nag/lib/Driver/Sql.php
+++ b/nag/lib/Driver/Sql.php
@@ -162,9 +162,9 @@ class Nag_Driver_Sql extends Nag_Driver {
                   $methods = null, $uid = null, $parent = '', $private = false,
                   $owner = null, $assignee = null)
     {
-        $taskId = md5(uniqid(mt_rand(), true));
+        $taskId = strval(new Horde_Support_Uuid());
         if ($uid === null) {
-            $uid = $this->generateUID();
+            $uid = strval(new Horde_Support_Uuid());
         }
 
         $query = sprintf(
@@ -528,7 +528,7 @@ class Nag_Driver_Sql extends Nag_Driver {
     {
         /* Make sure tasks always have a UID. */
         if (empty($row['task_uid'])) {
-            $row['task_uid'] = $this->generateUID();
+            $row['task_uid'] = strval(new Horde_Support_Uuid());
 
             $query = 'UPDATE ' . $this->_params['table'] .
                 ' SET task_uid = ?' .
diff --git a/nag/lib/Nag.php b/nag/lib/Nag.php
index de89b72c5..67b247a57 100644
--- a/nag/lib/Nag.php
+++ b/nag/lib/Nag.php
@@ -445,7 +445,7 @@ class Nag
     public static function addTasklist($info)
     {
         try {
-            $tasklist = $GLOBALS['nag_shares']->newShare(md5(microtime()));
+            $tasklist = $GLOBALS['nag_shares']->newShare(strval(new Horde_Support_Uuid()));
             $tasklist->set('name', $info['name']);
             $tasklist->set('color', $info['color']);
             $tasklist->set('desc', $info['description']);
diff --git a/skoli/lib/Driver.php b/skoli/lib/Driver.php
index 697f4d01d..279f9b98e 100644
--- a/skoli/lib/Driver.php
+++ b/skoli/lib/Driver.php
@@ -135,17 +135,4 @@ class Skoli_Driver {
         return $instances[$signature];
     }
 
-    /**
-     * Generate a universal / unique identifier for an entry. This is
-     * NOT something that we expect to be able to parse into a
-     * entry list.
-     *
-     * @return string  A nice unique string (should be 255 chars or less).
-     */
-    function generateUID()
-    {
-        return date('YmdHis') . '.'
-            . substr(str_pad(base_convert(microtime(), 10, 36), 16, uniqid(mt_rand()), STR_PAD_LEFT), -16)
-            . '@' . $GLOBALS['conf']['server']['name'];
-    }
 }
diff --git a/skoli/lib/Driver/sql.php b/skoli/lib/Driver/sql.php
index aa6375cf0..fb7393f38 100644
--- a/skoli/lib/Driver/sql.php
+++ b/skoli/lib/Driver/sql.php
@@ -504,9 +504,9 @@ class Skoli_Driver_sql extends Skoli_Driver {
             $query = 'INSERT INTO ' . $this->_params['objects_table'] .
                      ' (object_id, object_owner, object_uid, class_id, student_id, object_time, object_type)' .
                      ' VALUES (?, ?, ?, ?, ?, ?, ?)';
-            $entryId = md5(uniqid(mt_rand(), true));
+            $entryId = strval(new Horde_Support_Uuid());
             $date = new Horde_Date($vars->get('object_time'));
-            $values = array($entryId, $GLOBALS['registry']->getAuth(), $this->generateUID(), $this->_class, $studentid, $date->datestamp(), $vars->get('object_type'));
+            $values = array($entryId, $GLOBALS['registry']->getAuth(), strval(new Horde_Support_Uuid()), $this->_class, $studentid, $date->datestamp(), $vars->get('object_type'));
 
             /* Log the query at a DEBUG log level. */
             Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), 'DEBUG');
diff --git a/skoli/lib/Forms/CreateClass.php b/skoli/lib/Forms/CreateClass.php
index 90f10b486..e930a075c 100644
--- a/skoli/lib/Forms/CreateClass.php
+++ b/skoli/lib/Forms/CreateClass.php
@@ -168,7 +168,7 @@ class Skoli_CreateClassForm extends Horde_Form {
         }
 
         // Create new share.
-        $this->shareid = md5(microtime());
+        $this->shareid = strval(new Horde_Support_Uuid());
         $class = $GLOBALS['skoli_shares']->newShare($this->shareid);
         if (is_a($class, 'PEAR_Error')) {
             return $class;
diff --git a/trean/lib/Bookmarks.php b/trean/lib/Bookmarks.php
index ab9032ee1..1187b1705 100644
--- a/trean/lib/Bookmarks.php
+++ b/trean/lib/Bookmarks.php
@@ -821,7 +821,7 @@ class DataTreeObject_Folder extends DataTreeObject {
      */
     function addFolder($properties)
     {
-        $folder = &$this->_shareOb->newFolder($this->getName() . ':' . md5(uniqid(mt_rand())), $properties);
+        $folder = &$this->_shareOb->newFolder($this->getName() . ':' . strval(new Horde_Support_Uuid()), $properties);
         $this->_shareOb->addFolder($folder);
         return $this->datatree->getId($folder);
     }
diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php
index d0823d30f..1c59de2f8 100644
--- a/turba/lib/Driver.php
+++ b/turba/lib/Driver.php
@@ -789,7 +789,7 @@ class Turba_Driver
         }
 
         if (!isset($attributes['__uid'])) {
-            $attributes['__uid'] = $this->generateUID();
+            $attributes['__uid'] = strval(new Horde_Support_Uuid());
         }
 
         $key = $attributes['__key'] = $this->_makeKey($this->toDriverKeys($attributes));
@@ -959,20 +959,6 @@ class Turba_Driver
     }
 
     /**
-     * Generates a universal/unique identifier for a contact. This is NOT
-     * something that we expect to be able to parse into an addressbook and a
-     * contactId.
-     *
-     * @return string  A nice unique string (should be 255 chars or less).
-     */
-    function generateUID()
-    {
-        return date('YmdHis') . '.'
-            . substr(str_pad(base_convert(microtime(), 10, 36), 16, uniqid(mt_rand()), STR_PAD_LEFT), -16)
-            . '@' . $GLOBALS['conf']['server']['name'];
-    }
-
-    /**
      * Exports a given Turba_Object as an iCalendar vCard.
      *
      * @param Turba_Object $object  Turba_Object.
diff --git a/turba/lib/Driver/Kolab.php b/turba/lib/Driver/Kolab.php
index 4427bd40e..a7d824801 100644
--- a/turba/lib/Driver/Kolab.php
+++ b/turba/lib/Driver/Kolab.php
@@ -151,11 +151,9 @@ class Turba_Driver_Kolab extends Turba_Driver
      */
     function generateUID()
     {
-        if (method_exists($this->_wrapper, 'generateUID')) {
-            return $this->_wrapper->generateUID();
-        } else {
-            return parent::generateUID();
-        }
+        return method_exists($this->_wrapper, 'generateUID')
+            ? $this->_wrapper->generateUID()
+            : strval(new Horde_Support_Uuid());
     }
 
     /**
@@ -1281,7 +1279,7 @@ class Turba_Driver_Kolab_Wrapper_New extends Turba_Driver_Kolab_Wrapper {
         }
 
         do {
-            $key = md5(uniqid(mt_rand(), true));
+            $key = strval(new Horde_Support_Uuid());
         } while(in_array($key, array_keys($this->_contacts_cache)));
 
         return $key;
diff --git a/turba/lib/Driver/Sql.php b/turba/lib/Driver/Sql.php
index 321797d50..b23bdfc3a 100644
--- a/turba/lib/Driver/Sql.php
+++ b/turba/lib/Driver/Sql.php
@@ -587,7 +587,7 @@ class Turba_Driver_Sql extends Turba_Driver
      */
     function _makeKey($attributes)
     {
-        return md5(uniqid(mt_rand(), true));
+        return strval(new Horde_Support_Uuid());
     }
 
     /**
diff --git a/turba/scripts/upgrades/public_to_horde_share.php b/turba/scripts/upgrades/public_to_horde_share.php
index b87bcaf2b..917ed1ebc 100755
--- a/turba/scripts/upgrades/public_to_horde_share.php
+++ b/turba/scripts/upgrades/public_to_horde_share.php
@@ -58,9 +58,9 @@ if (!$sourceKey) {
 }
 
 // Create the new share.
-$owner_uid = md5(microtime());
+$owner_uid = strval(new Horde_Support_Uuid());
 $share = &$turba_shares->newShare($sourceKey . ':' . $owner_uid);
-if (is_a($share, 'PEAR_Error')) {
+if ($share instanceof Horde_Share_Exception) {
     var_dump($share);
     exit;
 }
diff --git a/turba/search.php b/turba/search.php
index 4261e8a71..b1c65c706 100644
--- a/turba/search.php
+++ b/turba/search.php
@@ -27,7 +27,7 @@ function _createVBook($params)
                                     'criteria' => $params['criteria'])));
 
     try {
-        $share = Turba::createShare(md5(microtime()), $params);
+        $share = Turba::createShare(strval(new Horde_Support_Uuid()), $params);
     } catch (Horde_Share_Exception $e) {
         throw new Turba_Exception($e);
     }
diff --git a/whups/lib/Query.php b/whups/lib/Query.php
index 5ddf99a7e..041a88892 100644
--- a/whups/lib/Query.php
+++ b/whups/lib/Query.php
@@ -1015,7 +1015,7 @@ class Whups_QueryManager {
             }
         } else {
             // Create a new share for the query.
-            $share = $this->_shareManager->newShare(md5(microtime()));
+            $share = $this->_shareManager->newShare(strval(new Horde_Support_Uuid());
             $share->set('name', $query->name);
             $share->set('slug', $query->slug);
             try {
diff --git a/whups/lib/View/Results.php b/whups/lib/View/Results.php
index 4d297ffc4..c998912f7 100755
--- a/whups/lib/View/Results.php
+++ b/whups/lib/View/Results.php
@@ -16,7 +16,7 @@ class Whups_View_Results extends Whups_View {
     function Whups_View_Results($params)
     {
         parent::Whups_View($params);
-        $this->_id = md5(uniqid(mt_rand()));
+        $this->_id = uniqid(mt_rand());
     }
 
     function html()
diff --git a/wicked/scripts/mail-filter.php b/wicked/scripts/mail-filter.php
index 0903d7f4a..5c310db97 100755
--- a/wicked/scripts/mail-filter.php
+++ b/wicked/scripts/mail-filter.php
@@ -99,7 +99,7 @@ if ($message->getType() == 'text/plain') {
 $pageBody .= "\n";
 
 if (is_null($pageName)) {
-    $pageName = "EmailMessage" . ucfirst(md5(uniqid('wicked', true)));
+    $pageName = "EmailMessage" . ucfirst(md5(uniqid('wicked')));
 }
 
 $res = $wicked->newPage($pageName, $pageBody);