add a print_r for the yadis doc returned

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

diff --git a/lib/util.php b/lib/util.php
index 8d7d857c5c86407a5ce83c7527e7a9f23eaeec08..12680112634e444a5aa18b80bbb5b49ec25dee75 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -102,15 +102,15 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL) {
                                   $pagetitle . " - " . $config['site']['name']);
        common_element('link', array('rel' => 'stylesheet',
                                                                 'type' => 'text/css',
-                                                                'href' => $config['site']['path'] . 'theme/default/style/html.css',
+                                                                'href' => common_path('theme/default/style/html.css'),
                                                                 'media' => 'screen, projection, tv'));
        common_element('link', array('rel' => 'stylesheet',
                                                                 'type' => 'text/css',
-                                                                'href' => $config['site']['path'] . 'theme/default/style/layout.css',
+                                                                'href' => common_path('theme/default/style/layout.css'),
                                                                 'media' => 'screen, projection, tv'));
        common_element('link', array('rel' => 'stylesheet',
                                                                 'type' => 'text/css',
-                                                                'href' => $config['site']['path'] . 'theme/default/style/print.css',
+                                                                'href' => common_path('theme/default/style/print.css'),
                                                                 'media' => 'print'));
        if ($callable) {
                if ($data) {
@@ -238,6 +238,13 @@ function common_input($id, $label, $value=NULL) {
        common_element_end('p');
 }
 
+function common_hidden($id, $value) {
+       common_element('input', array('name' => $id,
+                                                                 'type' => 'hidden',
+                                                                 'id' => $id,
+                                                                 'value' => $value));
+}
+
 function common_password($id, $label) {
        common_element_start('p');
        common_element('label', array('for' => $id), $label);
@@ -354,8 +361,8 @@ define('URL_REGEX', '^|[ \t\r\n])((ftp|http|https|gopher|mailto|news|nntp|telnet
 function common_render_content($text, $notice) {
        $r = htmlspecialchars($text);
        $id = $notice->profile_id;
-       $r = preg_replace('/(^|\s)@([\w-]+)($|\s)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
-       $r = preg_replace('<'.URL_REGEX.'<', '<a href="\\0" class="extlink">\\0</a>', $r);
+       $r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
+       $r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
        # XXX: # tags
        # XXX: machine tags
        return $r;
@@ -407,12 +414,11 @@ function common_avatar_filename($user, $extension, $size=NULL, $extra=NULL) {
 
 function common_avatar_path($filename) {
        global $config;
-       return $config['avatar']['directory'] . '/' . $filename;
+       return INSTALLDIR . '/avatar/' . $filename;
 }
 
 function common_avatar_url($filename) {
-       global $config;
-       return "http://".$config['site']['server'].$config['avatar']['path'].'/'.$filename;
+       return common_path('avatar/'.$filename);
 }
 
 function common_default_avatar($size) {
@@ -420,11 +426,11 @@ function common_default_avatar($size) {
                                                          AVATAR_STREAM_SIZE => 'stream',
                                                          AVATAR_MINI_SIZE => 'mini');
        global $config;
-       return "http://".$config['site']['server'].$config['site']['path'].'/'.$config['avatar']['default'][$sizenames[$size]];
+       
+       return common_path($config['avatar']['default'][$sizenames[$size]]);
 }
 
 function common_local_url($action, $args=NULL) {
-       global $config;
        /* XXX: pretty URLs */
        $extra = '';
        if ($args) {
@@ -432,8 +438,13 @@ function common_local_url($action, $args=NULL) {
                        $extra .= "&${key}=${value}";
                }
        }
+       return common_path("index.php?action=${action}${extra}");
+}
+
+function common_path($relative) {
+       global $config;
        $pathpart = ($config['site']['path']) ? $config['site']['path']."/" : '';
-       return "http://".$config['site']['server'].'/'.$pathpart."index.php?action=${action}${extra}";
+       return "http://".$config['site']['server'].'/'.$pathpart.$relative;
 }
 
 function common_date_string($dt) {
@@ -488,9 +499,7 @@ function common_mint_tag($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;
+       return common_path('');
 }
 
 # returns $bytes bytes of random data as a hexadecimal string
@@ -525,6 +534,16 @@ function common_mtrand($bytes) {
        return $enc;
 }
 
+function common_set_returnto($url) {
+       common_ensure_session();
+       $_SESSION['returnto'] = $url;
+}
+
+function common_get_returnto() {
+       common_ensure_session();
+       return $_SESSION['returnto'];
+}
+
 function common_timestamp() {
        return date('YmdHis');
 }