X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticeform.php;h=698d1f6a609187339a158164c4c471cf2930b518;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=9d931b92ed5d06165e69fb16916dd3c1d4f1d7e0;hpb=c6f9baf78cce7ca2e2e5d2f6c4752209e0a74616;p=quix0rs-gnu-social.git diff --git a/lib/noticeform.php b/lib/noticeform.php index 9d931b92ed..698d1f6a60 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -28,11 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/form.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * Form for posting a notice @@ -53,7 +49,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 +75,60 @@ 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 $action, array $options = array()) { - $this->id_suffix = time(); + parent::__construct($action); + + // When creating a notice form we don't want to collide with + // possibly existing HTML elements, as naming conventions are similar. + $this->id_suffix = mt_rand(); + + $this->actionName = $action->trimmed('action'); + + $prefill = array('content', 'inreplyto', 'lat', + 'lon', 'location_id', 'location_ns', + 'to_group', 'to_profile', 'private'); + + foreach ($prefill as $fieldName) { + if (array_key_exists($fieldName, $options)) { + $this->$fieldName = $options[$fieldName]; + } + } - parent::__construct($out); + // Prefill the profile if we're replying - $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; + 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(); } @@ -157,6 +184,15 @@ class NoticeForm extends Form $this->out->element('legend', null, _('Send a notice')); } + protected function placeholderText() + { + if ($this->inreplyto) { + return _('Write a reply...'); + } + + return _('Share your status...'); + } + /** * Data elements * @@ -171,6 +207,8 @@ 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', + 'placeholder' => $this->placeholderText(), 'cols' => 35, 'rows' => 4, 'name' => 'status_textarea'), @@ -186,44 +224,53 @@ class NoticeForm extends Form if (common_config('attachments', 'uploads')) { $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota')); - // TRANS: Input label in notice form for adding an attachment. - $this->out->elementStart('label', array('class' => 'notice_data-attach')); - $this->out->text(_('Attach')); + $this->out->element('label', array('class' => 'notice_data-attach', + 'for' => $this->id().'-notice_data-attach'), + // TRANS: Input label in notice form for adding an attachment. + _('Attach')); + // The actual input element tends to be hidden with CSS. $this->out->element('input', array('class' => 'notice_data-attach', 'type' => 'file', 'name' => 'attach', + 'id' => $this->id().'-notice_data-attach', // TRANS: Title for input field to attach a file to a notice. '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'); $this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? (empty($this->profile->location_ns) ? null : $this->profile->location_ns) : $this->location_ns, 'location_ns'); $this->out->elementStart('div', array('class' => 'notice_data-geo_wrap', - 'title' => common_local_url('geocode'))); + 'data-api' => common_local_url('geocode'))); // @fixme checkbox method allows no way to change the id without changing the name //$this->out->checkbox('notice_data-geo', _('Share my location'), true); - $this->out->elementStart('label', 'notice_data-geo'); $this->out->element('input', array( 'name' => 'notice_data-geo', 'type' => 'checkbox', 'class' => 'checkbox', 'id' => $this->id() . '-notice_data-geo', - 'checked' => true, // ? + 'checked' => false, // Must be unchecked by default )); - $this->out->text(' '); - // TRANS: Field label to add location to a notice. - $this->out->text(_('Share my location')); - $this->out->elementEnd('label'); + $this->out->element('label', array('class' => 'notice_data-geo', + 'for' => $this->id().'-notice_data-geo'), + // TRANS: Checkbox label to allow sharing geo location in notices. + _('Share my location')); $this->out->elementEnd('div'); // TRANS: Text to not share location for a notice in notice form.