More info for a proper, fancy-url lighttpd setup

[quix0rs-gnu-social.git] / plugins / Bookmark / bookmarkform.php

diff --git a/plugins/Bookmark/bookmarkform.php b/plugins/Bookmark/bookmarkform.php
index ffeba312ea080712c34012ac4ad041c91414958e..20101e1effbd3e15ba68f5e9f37eacfcca272423 100644 (file)
--- a/plugins/Bookmark/bookmarkform.php
+++ b/plugins/Bookmark/bookmarkform.php
@@ -116,40 +116,52 @@ class BookmarkForm extends Form
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
-        $this->out->input('url',
+        $this->out->input('bookmark-url',
                           // TRANS: Field label on form for adding a new bookmark.
                           _m('LABEL','URL'),
-                          $this->_url);
+                          $this->_url,
+                          null,
+                          'url');
         $this->unli();
 
         if (!empty($this->_thumbnail)) {
+
+            list($width, $height) = $this->scaleImage($this->_thumbnail->width,
+                                                      $this->_thumbnail->height);
+
             $this->out->element('img',
                                 array('src' => $this->_thumbnail->url,
-                                      'width' => $this->_thumbnail->width,
-                                      'height' => $this->_thumbnail->height));
+                                      'class' => 'bookmarkform-thumbnail',
+                                      'width' => $width,
+                                      'height' => $height));
         }
 
         $this->li();
-        $this->out->input('title',
+        $this->out->input('bookmark-title',
                           // TRANS: Field label on form for adding a new bookmark.
                           _m('LABEL','Title'),
-                          $this->_title);
+                          $this->_title,
+                          null,
+                          'title');
         $this->unli();
 
         $this->li();
-        $this->out->textarea('description',
+        $this->out->textarea('bookmark-description',
                              // TRANS: Field label on form for adding a new bookmark.
                              _m('LABEL','Notes'),
-                             $this->_description);
+                             $this->_description,
+                             null,
+                             'description');
         $this->unli();
 
         $this->li();
-        $this->out->input('tags',
+        $this->out->input('bookmark-tags',
                           // TRANS: Field label on form for adding a new bookmark.
                           _m('LABEL','Tags'),
                           $this->_tags,
                           // TRANS: Field title on form for adding a new bookmark.
-                          _m('Comma- or space-separated list of tags.'));
+                          _m('Comma- or space-separated list of tags.'),
+                          'tags');
         $this->unli();
 
         $this->out->elementEnd('ul');
@@ -171,6 +183,22 @@ class BookmarkForm extends Form
     function formActions()
     {
         // TRANS: Button text for action to save a new bookmark.
-        $this->out->submit('submit', _m('BUTTON', 'Save'));
+        $this->out->submit('bookmark-submit', _m('BUTTON', 'Save'), 'submit', 'submit');
+    }
+
+    function scaleImage($width, $height)
+    {
+        $maxwidth = common_config('attachments', 'thumb_width');
+        $maxheight = common_config('attachments', 'thumb_height');
+
+        if ($width > $height && $width > $maxwidth) {
+            $height = (int) ((((float)$maxwidth)/(float)($width))*(float)$height);
+            $width = $maxwidth;
+        } else if ($height > $maxheight) {
+            $width = (int) ((((float)$maxheight)/(float)($height))*(float)$width);
+            $height = $maxheight;
+        }
+
+        return array($width, $height);
     }
 }