fix cc license url

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

diff --git a/lib/util.php b/lib/util.php
index 64fa230d201b7bd75122352557d338663a2d25d3..268c9ef2c97d22be0ae7f6d65b8beacfbe66f913 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -202,7 +202,7 @@ function common_foot_menu() {
        common_menu_item(common_local_url('doc', array('title' => 'privacy')),
                                         _t('Privacy'));
        common_menu_item(common_local_url('doc', array('title' => 'source')),
-                                        _t('Privacy'));
+                                        _t('Source'));
        common_element_end('ul');
 }
 
@@ -349,13 +349,13 @@ function common_render_content($text) {
 
 // where should the avatar go for this user?
 
-function common_avatar_filename($user, $extension, $size=NULL) {
+function common_avatar_filename($user, $extension, $size=NULL, $extra=NULL) {
        global $config;
 
        if ($size) {
-               return $user->id . '-' . $size . $extension;
+               return $user->id . '-' . $size . (($extra) ? ('-' . $extra) : '') . $extension;
        } else {
-               return $user->id . '-original' . $extension;
+               return $user->id . '-original' . (($extra) ? ('-' . $extra) : '') . $extension;
        }
 }
 
@@ -439,6 +439,50 @@ function common_mint_tag($extra) {
          $config['tag']['date'].':'.$config['tag']['prefix'].$extra;
 }
 
+# Should make up a reasonable root URL
+
+function common_root_url() {
+       global $config;
+       $pathpart = ($config['site']['path']) ? $config['site']['path']."/" : '';
+       return "http://".$config['site']['server'].'/'.$pathpart;
+}
+
+# returns $bytes bytes of random data as a hexadecimal string
+# "good" here is a goal and not a guarantee
+
+function common_good_rand($bytes) {
+       # XXX: use random.org...?
+       if (file_exists('/dev/urandom')) {
+               return common_urandom($bytes);
+       } else { # FIXME: this is probably not good enough
+               return common_mtrand($bytes);
+       }
+}
+
+function common_urandom($bytes) {
+       $h = fopen('/dev/urandom', 'rb');
+       # should not block
+       $src = fread($h, $bytes);
+       fclose($h);
+       $enc = '';
+       for ($i = 0; $i < $bytes; $i++) {
+               $enc .= sprintf("%02x", (ord($src[$i])));
+       }
+       return $enc;
+}
+
+function common_mtrand($bytes) {
+       $enc = '';
+       for ($i = 0; $i < $bytes; $i++) {
+               $enc .= sprintf("%02x", mt_rand(0, 255));
+       }
+       return $enc;
+}
+
+function common_timestamp() {
+       return date('YmdHis');
+}
+       
 // XXX: set up gettext
 
 function _t($str) {