common_(un)subscribe_form

darcs-hash:20081120203528-84dde-2b8d14a491ea4d44bebfdd4e4a3041dde3b375c1.gz

diff --git a/lib/profilelist.php b/lib/profilelist.php
index ebc974d6b9b991c23ba6a8eb2f615733dc2184c7..b8f52fd8fc9af8fc6d70b506a6495a8332e583fc 100644 (file)
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -95,6 +95,16 @@ class ProfileList {
                        common_raw($this->highlight($this->profile->bio));
                        common_element_end('p');
                }
+               
+               $user = common_current_user();
+               if ($user) {
+                       if ($user->isSubscribed($this->profile)) {
+                               common_unsubscribe_form($profile);
+                       } else {
+                               common_subscribe_form($profile);
+                       }
+               }
+               
                common_element_end('li');
        }
 

diff --git a/lib/util.php b/lib/util.php
index 950a747337fdd1807597c422babce1a020fe3e50..efce283a91d25e47d455c6cc481ad574a4a97754 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -1896,11 +1896,13 @@ function common_nudge_form($profile) {
        common_element_end('form');
 }
 
-function common_subscribe_form() {
-       common_element_start('form', array('id' => 'subscribe', 'method' => 'post', 'class' => 'subscribe',
+function common_subscribe_form($profile) {
+       common_element_start('form', array('id' => 'subscribe-' . $profile->nickname,
+                                                                          'method' => 'post',
+                                                                          'class' => 'subscribe',
                                                                           'action' => common_local_url('subscribe')));
        common_hidden('token', common_session_token());
-       common_element('input', array('id' => 'subscribeto',
+       common_element('input', array('id' => 'subscribeto-' . $profile->nickname,
                                                                  'name' => 'subscribeto',
                                                                  'type' => 'hidden',
                                                                  'value' => $profile->nickname));
@@ -1910,11 +1912,13 @@ function common_subscribe_form() {
        common_element_end('form');
 }
 
-function common_unsubscribe_form() {
-       common_element_start('form', array('id' => 'unsubscribe', 'method' => 'post', 'class' => 'unsubscribe',
+function common_unsubscribe_form($profile) {
+       common_element_start('form', array('id' => 'unsubscribe-' . $profile->nickname,
+                                                                          'method' => 'post',
+                                                                          'class' => 'unsubscribe',
                                                                           'action' => common_local_url('unsubscribe')));
        common_hidden('token', common_session_token());
-       common_element('input', array('id' => 'unsubscribeto',
+       common_element('input', array('id' => 'unsubscribeto-' . $profile->nickname,
                                                                  'name' => 'unsubscribeto',
                                                                  'type' => 'hidden',
                                                                  'value' => $profile->nickname));