Suppress errors when checking for the existence of files that might be restricted...

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

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 0a4f486db216ba9b63072a377906f319bb924178..606b5d028e7d73826cdd3d0d4a5f757575af2bbf 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -63,6 +63,12 @@ class NoticeForm extends Form
 
     var $content = null;
 
+    /**
+     * The current user
+     */
+
+    var $user = null;
+
     /**
      * Constructor
      *
@@ -71,12 +77,19 @@ class NoticeForm extends Form
      * @param string        $content content to pre-fill
      */
 
-    function __construct($out=null, $action=null, $content=null)
+    function __construct($out=null, $action=null, $content=null, $user=null)
     {
         parent::__construct($out);
 
         $this->action  = $action;
         $this->content = $content;
+        
+        if ($user) {
+            $this->user = $user;
+        } else {
+            $this->user = common_current_user();
+        }
+        
     }
 
     /**
@@ -121,20 +134,14 @@ class NoticeForm extends Form
 
     function formData()
     {
-        $user = common_current_user();
-
-        $this->out->elementStart('ul', 'form_datas');
-        $this->out->elementStart('li', array('id' => 'notice_text'));
         $this->out->element('label', array('for' => 'notice_data-text'),
-                            sprintf(_('What\'s up, %s?'), $user->nickname));
+                            sprintf(_('What\'s up, %s?'), $this->user->nickname));
         // XXX: vary by defined max size
         $this->out->element('textarea', array('id' => 'notice_data-text',
                                               'cols' => 35,
                                               'rows' => 4,
                                               'name' => 'status_textarea'),
                             ($this->content) ? $this->content : '');
-        $this->out->elementEnd('li');
-        $this->out->elementEnd('ul');
 
         $this->out->elementStart('dl', 'form_note');
         $this->out->element('dt', null, _('Available characters'));
@@ -143,13 +150,9 @@ class NoticeForm extends Form
         $this->out->elementEnd('dl');
 
         if ($this->action) {
-        // FIXME: or VERIFY that notice_return-to doesn't break anything. Changed from 'returnto'
-            $this->out->hidden('notice_return-to', $this->action);
+            $this->out->hidden('notice_return-to', $this->action, 'returnto');
         }
-
-        // FIXME: Does this need to be checked like returnto?
-        $this->out->hidden('notice_in-reply-to', $this->action);
-
+        $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
     }
 
     /**
@@ -160,14 +163,10 @@ class NoticeForm extends Form
 
     function formActions()
     {
-        $this->out->elementStart('ul', 'form_actions');
-        $this->out->elementStart('li', array('id' => 'notice_submit'));
         $this->out->element('input', array('id' => 'notice_action-submit',
                                            'class' => 'submit',
                                            'name' => 'status_submit',
                                            'type' => 'submit',
                                            'value' => _('Send')));
-        $this->out->elementEnd('li');
-        $this->out->elementEnd('ul');
     }
 }