X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticeform.php;h=e241b5812c6af7b0ab73ea459b2d610921f0c655;hb=f05f7017646d824e840f4a1cbce1f224bcb340b5;hp=ee4e2ca9670fe8dbf29b16f29dbe21641099641e;hpb=9f1603462dce7a24d432698c4f46d7dcf1bf7c4f;p=quix0rs-gnu-social.git

diff --git a/lib/noticeform.php b/lib/noticeform.php
index ee4e2ca967..e241b5812c 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
@@ -107,7 +103,7 @@ class NoticeForm extends Form
         // Do we have to worry about sub-second race conditions?
         // XXX: Needs to be above the parent::__construct() call...?
 
-        $this->id_suffix = time();
+        $this->id_suffix = rand();
 
         parent::__construct($action);
 
@@ -131,7 +127,7 @@ class NoticeForm extends Form
 
         if (empty($this->to_profile) &&
             !empty($this->inreplyto)) {
-            $notice = Notice::staticGet('id', $this->inreplyto);
+            $notice = Notice::getKV('id', $this->inreplyto);
             if (!empty($notice)) {
                 $this->to_profile = $notice->getProfile();
             }
@@ -208,6 +204,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' => _('Share your status...'),
                                                   'cols' => 35,
                                                   'rows' => 4,
                                                   'name' => 'status_textarea'),
@@ -246,7 +244,7 @@ class NoticeForm extends Form
             $toWidget->show();
             $this->out->elementEnd('div');
 
-            if ($this->user->shareLocation()) {
+            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');
@@ -256,6 +254,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(