Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / uuid.php

diff --git a/lib/uuid.php b/lib/uuid.php
index 93153504f2868ec8eca91df7c61714358a0981bd..233efbfb2fa9ea930c5b2646752933dbdffe7fe6 100644 (file)
--- a/lib/uuid.php
+++ b/lib/uuid.php
@@ -47,6 +47,7 @@ if (!defined('STATUSNET')) {
 
 class UUID
 {
+    const REGEX = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
     protected $str = null;
 
     /**
@@ -92,18 +93,18 @@ class UUID
     {
         return sprintf('%s-%s-%04x-%04x-%s',
                        // 32 bits for "time_low"
-                       common_good_rand(4),
+                       common_random_hexstr(4),
                        // 16 bits for "time_mid"
-                       common_good_rand(2),
+                       common_random_hexstr(2),
                        // 16 bits for "time_hi_and_version",
                        // four most significant bits holds version number 4
-                       (hexdec(common_good_rand(2)) & 0x0fff) | 0x4000,
+                       (hexdec(common_random_hexstr(2)) & 0x0fff) | 0x4000,
                        // 16 bits, 8 bits for "clk_seq_hi_res",
                        // 8 bits for "clk_seq_low",
                        // two most significant bits holds zero and one
                        // for variant DCE1.1
-                       (hexdec(common_good_rand(2)) & 0x3fff) | 0x8000,
+                       (hexdec(common_random_hexstr(2)) & 0x3fff) | 0x8000,
                        // 48 bits for "node"
-                       common_good_rand(6));
+                       common_random_hexstr(6));
     }   
 }