summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2008-10-24 22:28:49 -0400
committerEvan Prodromou <evan@controlyourself.ca>2008-10-24 22:28:49 -0400
commit22057e01bd6fdf366340e6fdbdf6bb1252bceb8c (patch)
treef3480cdbfb956eaa90a3e80de66d21e7080f4a89
parentb26477d787481060e274f3a7007eaea2a6042062 (diff)
add SUP link to User RSS
darcs-hash:20081025022849-5ed1f-edd99a830ff285f4d0468e0e9ce3ceba4a885352.gz
-rw-r--r--actions/userrss.php10
-rw-r--r--htaccess.sample2
-rw-r--r--lib/util.php16
3 files changed, 23 insertions, 5 deletions
diff --git a/actions/userrss.php b/actions/userrss.php
index 1f103dc08..a30c7bc28 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -79,4 +79,14 @@ class UserrssAction extends Rss10Action {
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
return ($avatar) ? $avatar->url : NULL;
}
+
+ # override parent to add X-SUP-ID URL
+
+ function show_rss($limit=0) {
+ $url = common_local_url('sup', NULL, $this->user->id);
+ header('X-SUP-ID', $url);
+ parent::show_rss($limit);
+ }
+
+
} \ No newline at end of file
diff --git a/htaccess.sample b/htaccess.sample
index d05a74603..58b060b6c 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -38,6 +38,8 @@ RewriteRule ^main/invite$ index.php?action=invite [L,QSA]
RewriteRule ^main/favor$ index.php?action=favor [L,QSA]
RewriteRule ^main/disfavor$ index.php?action=disfavor [L,QSA]
+RewriteRule ^main/sup$ index.php?action=sup [L,QSA]
+
RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA]
RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA]
RewriteRule ^settings/im$ index.php?action=imsettings [L,QSA]
diff --git a/lib/util.php b/lib/util.php
index 924625e02..1bc5b95b0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -809,13 +809,17 @@ function common_default_avatar($size) {
return theme_path('default-avatar-'.$sizenames[$size].'.png');
}
-function common_local_url($action, $args=NULL) {
- global $config;
- if ($config['site']['fancy']) {
- return common_fancy_url($action, $args);
+function common_local_url($action, $args=NULL, $fragment=NULL) {
+ $url = NULL;
+ if (common_config('site','fancy')) {
+ $url = common_fancy_url($action, $args);
} else {
- return common_simple_url($action, $args);
+ $url = common_simple_url($action, $args);
+ }
+ if (!is_null($fragment)) {
+ $url .= '#'.$fragment;
}
+ return $url;
}
function common_fancy_url($action, $args=NULL) {
@@ -971,6 +975,8 @@ function common_fancy_url($action, $args=NULL) {
}
default: return common_simple_url($action, $args);
}
+ case 'sup':
+ return common_path('main/sup');
default:
return common_simple_url($action, $args);
}