Moved common_profile_new_message_nudge() to showstream.php

4 files changed, 35 insertions, 24 deletions

diff --git a/actions/nudge.php b/actions/nudge.php
index bb80ce357..456106459 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -88,7 +88,7 @@ class NudgeAction extends Action
         $this->notify($user, $other);
 
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8', true);
             $this->elementStart('head');
             $this->element('title', null, _('Nudge sent'));
             $this->elementEnd('head');
diff --git a/actions/showstream.php b/actions/showstream.php
index 3882af845..a411fae5b 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -326,7 +326,24 @@ class ShowstreamAction extends Action
         }
         $this->elementEnd('li');
 
-        common_profile_new_message_nudge($cur, $this->user, $this->profile);
+//        common_profile_new_message_nudge($cur, $this->user, $this->profile);
+
+        $user = User::staticGet('id', $this->profile->id);
+        if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
+           $this->elementStart('li', array('id' => 'user_send_a_new_message'));
+            $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))),
+                           _('Send a message'));
+            $this->elementEnd('li');
+
+            if ($user->email && $user->emailnotifynudge) {
+                $this->elementStart('li', array('id' => 'user_nudge'));
+                $nf = new NudgeForm($this, $user);
+                $nf->show();
+                $this->elementEnd('li');
+            }
+        }
+
+
 
         if ($cur && $cur->id != $this->profile->id) {
             $blocked = $cur->hasBlocked($this->profile);
@@ -349,7 +366,7 @@ class ShowstreamAction extends Action
         $url = common_local_url('remotesubscribe',
                                 array('nickname' => $this->profile->nickname));
         $this->element('a', array('href' => $url,
-                                  'id' => 'remotesubscribe'),
+                                  'id' => 'user_subscribe_remote'),
                        _('Subscribe'));
     }
 
diff --git a/lib/nudgeform.php b/lib/nudgeform.php
index 7d04e11e4..6374a7698 100644
--- a/lib/nudgeform.php
+++ b/lib/nudgeform.php
@@ -77,9 +77,22 @@ class NudgeForm extends Form
 
     function id()
     {
-        return 'nudge';
+        return 'form_user_nudge';
     }
 
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        return 'form_user_nudge';
+    }
+
+
     /**
      * Action of the form
      *
@@ -102,4 +115,4 @@ class NudgeForm extends Form
     {
         $this->out->submit('submit', _('Send a nudge'));
     }
-}
\ No newline at end of file
+}
diff --git a/lib/util.php b/lib/util.php
index 73c4cdcc8..ed7284183 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1645,25 +1645,6 @@ function common_nudge_response()
     common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
 }
 
-// XXX: Refactor this code
-function common_profile_new_message_nudge ($cur, $profile)
-{
-    $user = User::staticGet('id', $profile->id);
-
-    if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
-        common_element_start('li', array('id' => 'profile_send_a_new_message'));
-        common_element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))),
-                       _('Send a message'));
-        common_element_end('li');
-
-        if ($user->email && $user->emailnotifynudge) {
-            common_element_start('li', array('id' => 'profile_nudge'));
-            common_nudge_form($user);
-            common_element_end('li');
-        }
-    }
-}
-
 function common_cache_key($extra)
 {
     return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra;