add timestamp to avatar filenames to prevent overlap

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

diff --git a/lib/util.php b/lib/util.php
index 052f35fdd950b6b1439cd91ed723b7b72dda6c5b..9c288198cb79554f3b5be57f3bbea5422effd185 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -82,7 +82,7 @@ function common_end_xml() {
        $xw->flush();
 }
 
-function common_show_header($pagetitle) {
+function common_show_header($pagetitle, $callable=NULL, $data=NULL) {
        global $config, $xw;
 
        header('Content-Type: application/xhtml+xml');
@@ -112,6 +112,13 @@ function common_show_header($pagetitle) {
                                                                 'type' => 'text/css',
                                                                 'href' => $config['site']['path'] . 'theme/default/style/print.css',
                                                                 'media' => 'print'));
+       if ($callable) {
+               if ($data) {
+                       call_user_func($callable, $data);
+               } else {
+                       call_user_func($callable);
+               }
+       }
        common_element_end('head');
        common_element_start('body');
        common_element_start('div', array('id' => 'wrapper'));
@@ -165,8 +172,7 @@ function common_license_block() {
 function common_head_menu() {
        $user = common_current_user();
        common_element_start('ul', array('id' => 'menu', 'class' => ($user) ? 'five' : 'three'));
-       common_menu_item(common_local_url('doc', array('title' => 'help')),
-                                        _t('Help'));
+       common_menu_item(common_local_url('public'), _t('Public'));
        if ($user) {
                common_menu_item(common_local_url('all', array('nickname' =>
                                                                                                           $user->nickname)),
@@ -195,6 +201,8 @@ function common_foot_menu() {
                                         _t('Help'));
        common_menu_item(common_local_url('doc', array('title' => 'privacy')),
                                         _t('Privacy'));
+       common_menu_item(common_local_url('doc', array('title' => 'source')),
+                                        _t('Privacy'));
        common_element_end('ul');
 }
 
@@ -341,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;
        }
 }
 
@@ -358,7 +366,15 @@ function common_avatar_path($filename) {
 
 function common_avatar_url($filename) {
        global $config;
-       return $config['avatar']['path'] . '/' . $filename;
+       return "http://".$config['site']['server'].$config['avatar']['path'].'/'.$filename;
+}
+
+function common_default_avatar($size) {
+       static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
+                                                         AVATAR_STREAM_SIZE => 'stream',
+                                                         AVATAR_MINI_SIZE => 'mini');
+       global $config;
+       return "http://".$config['site']['server'].$config['site']['path'].'/'.$config['avatar']['default'][$sizenames[$size]];
 }
 
 function common_local_url($action, $args=NULL) {
@@ -395,7 +411,7 @@ function common_redirect($url, $code=307) {
        common_element('a', array('href' => $url), $url);
 }
 
-function common_broadcast_notices($id) {
+function common_broadcast_notice($notice) {
        // XXX: broadcast notices to remote subscribers
        // XXX: broadcast notices to SMS
        // XXX: broadcast notices to Jabber
@@ -416,6 +432,57 @@ function common_notice_form() {
        common_element_end('form');
 }
 
+function common_mint_tag($extra) {
+       global $config;
+       return 
+         'tag:'.$config['tag']['authority'].','.
+         $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('YmdHisu');
+}
+       
 // XXX: set up gettext
 
 function _t($str) {