X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticeform.php;h=012619a0ba19a1b38f515c27432947deab0cac2f;hb=7617fb65d701e3c8fbdb5e2798c2956531facf67;hp=3909b088d0120d93cbb5c620447ca7e64b4e3bc8;hpb=325cb4833db7e3fd396720f12a27b880b63f4173;p=quix0rs-gnu-social.git

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 3909b088d0..012619a0ba 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -53,7 +53,7 @@ class NoticeForm extends Form
     /**
      * Current action, used for returning to this page.
      */
-    var $action = null;
+    var $actionName = null;
 
     /**
      * Pre-filled content of the form
@@ -79,29 +79,66 @@ class NoticeForm extends Form
     var $location_id;
     var $location_ns;
 
+    /** select this group from the drop-down by default. */
+    var $to_group;
+
+    /** select this user from the drop-down by default. */
+    var $to_profile;
+
+    /** Pre-click the private checkbox. */
+    var $private;
+
     /**
      * Constructor
      *
-     * @param HTMLOutputter $out     output channel
-     * @param string        $action  action to return to, if any
-     * @param string        $content content to pre-fill
+     * @param Action $action  Action we're being embedded into
+     * @param array  $options Array of optional parameters
+     *                        'user' a user instead of current
+     *                        'content' notice content
+     *                        'inreplyto' ID of notice to reply to
+     *                        'lat' Latitude
+     *                        'lon' Longitude
+     *                        'location_id' ID of location
+     *                        'location_ns' Namespace of location
      */
-    function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null, $lat=null, $lon=null, $location_id=null, $location_ns=null)
+    function __construct($action, $options=null)
     {
-        $this->id_suffix = time();
+        // XXX: ??? Is this to keep notice forms distinct?
+        // Do we have to worry about sub-second race conditions?
+        // XXX: Needs to be above the parent::__construct() call...?
+
+        $this->id_suffix = rand();
+
+        parent::__construct($action);
+
+        if (is_null($options)) {
+            $options = array();
+        }
+
+        $this->actionName  = $action->trimmed('action');
 
-        parent::__construct($out);
+        $prefill = array('content', 'inreplyto', 'lat', 
+                         'lon', 'location_id', 'location_ns',
+                         'to_group', 'to_profile', 'private');
 
-        $this->action  = $action;
-        $this->content = $content;
-        $this->inreplyto = $inreplyto;
-        $this->lat = $lat;
-        $this->lon = $lon;
-        $this->location_id = $location_id;
-        $this->location_ns = $location_ns;
+        foreach ($prefill as $fieldName) {
+            if (array_key_exists($fieldName, $options)) {
+                $this->$fieldName = $options[$fieldName];
+            }
+        }
+
+        // Prefill the profile if we're replying
+
+        if (empty($this->to_profile) &&
+            !empty($this->inreplyto)) {
+            $notice = Notice::getKV('id', $this->inreplyto);
+            if (!empty($notice)) {
+                $this->to_profile = $notice->getProfile();
+            }
+        }
 
-        if ($user) {
-            $this->user = $user;
+        if (array_key_exists('user', $options)) {
+            $this->user = $options['user'];
         } else {
             $this->user = common_current_user();
         }
@@ -171,6 +208,7 @@ class NoticeForm extends Form
                                 sprintf(_('What\'s up, %s?'), $this->user->nickname));
             // XXX: vary by defined max size
             $this->out->element('textarea', array('class' => 'notice_data-text',
+                                                  'required' => 'required',
                                                   'cols' => 35,
                                                   'rows' => 4,
                                                   'name' => 'status_textarea'),
@@ -196,12 +234,20 @@ class NoticeForm extends Form
                                                    'title' => _('Attach a file.')));
                 $this->out->elementEnd('label');
             }
-            if ($this->action) {
-                $this->out->hidden('notice_return-to', $this->action, 'returnto');
+            if (!empty($this->actionName)) {
+                $this->out->hidden('notice_return-to', $this->actionName, 'returnto');
             }
             $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
 
-            if ($this->user->shareLocation()) {
+            $this->out->elementStart('div', 'to-selector');
+            $toWidget = new ToSelector($this->out,
+                                       $this->user,
+                                       (!empty($this->to_group) ? $this->to_group : $this->to_profile));
+
+            $toWidget->show();
+            $this->out->elementEnd('div');
+
+            if ($this->profile->shareLocation()) {
                 $this->out->hidden('notice_data-lat', empty($this->lat) ? (empty($this->profile->lat) ? null : $this->profile->lat) : $this->lat, 'lat');
                 $this->out->hidden('notice_data-lon', empty($this->lon) ? (empty($this->profile->lon) ? null : $this->profile->lon) : $this->lon, 'lon');
                 $this->out->hidden('notice_data-location_id', empty($this->location_id) ? (empty($this->profile->location_id) ? null : $this->profile->location_id) : $this->location_id, 'location_id');
@@ -211,6 +257,7 @@ class NoticeForm extends Form
                                                       'data-api' => common_local_url('geocode')));
 
                 // @fixme checkbox method allows no way to change the id without changing the name
+                //// TRANS: Checkbox label to allow sharing geo location in notices.
                 //$this->out->checkbox('notice_data-geo', _('Share my location'), true);
                 $this->out->elementStart('label', 'notice_data-geo');
                 $this->out->element('input', array(