Changeset 694297

Timestamp:

04/09/2013 06:00:44 AM (13 years ago)

Author:

huntermaster

Message:

allow attached image sizes to be used as thumbnails

Location:

image-formatr/trunk

Files:

• class.admin.php (modified) (6 diffs)
• class.formatr.php (modified) (3 diffs)
• image-formatr.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

image-formatr/trunk/class.admin.php

@@ -18 +18 @@
                 'force'     => "",
                 'stdthumb'  => "on",
+                'attthumb'  => "fullsize",
                 'killanc'   => "on",
                 'inspect'   => "",
@@ -91 +92 @@
                                      'NOTE: may cause pages with lots of images to load slowly.'),
                                ),
+                'imgdefs'   => array(
+                    'name'  => 'imglong, imgshort',
+                    'title' => 'Default dimensions',
+                    'desc'  => 'These values will be used as the width & height.',
+                    'html'  => array('These values will be used as the width &amp; height in pixels by the <em>Auto determine orientation</em> setting which, if disabled will default to the <code>width</code> in the first box and the <code>height</code> in second box.',
+                                     'NOTE: leave one of the boxes blank (or zero) and it will be calculated using the aspect ratio to the other box.'),
+                               ),
+                'imgaddl'   => array(
+                    'name'  => 'img2long, img2short, img2page',
+                    'title' => 'Additional dimensions',
+                    'desc'  => 'These values will be used as the width & height.',
+                    'html'  => array('These dimensions are used if you want to specify different settings for the front page or the single display page or everything else.',
+                                     'These values will be used as the width &amp; height in pixels by the <em>Auto determine orientation</em> setting which, if disabled will default to the <code>width</code> in the first box and the <code>height</code> in second box.',
+                                     'NOTE: leave one of the boxes blank (or zero) and it will be calculated using the aspect ratio to the other box.'),
+                               ),
+                'attthumb'   => array(
+                    'title' => 'Use attached image as thumbnail',
+                    'desc'  => 'Select the size to use for the thumbnail with Wordpress attachment images, if available.',
+                    'html'  => array('If you attached an image to a post/page using the Wordpress <em>Add Media</em> button or through the <em>Media Library</em>, then you can use one of the auto-generated smaller sizes as the thumbnail.',
+                                     'Non-attached images will just use the full-size image as the thumbnail and if the attached image size you specify is not available, the full-size image will also be used.'),
+                               ),
                 'addclass'  => array(
                     'title' => 'Additional classes',
@@ -160 +182 @@
                                      '<em>Remember: the database is cleaned up when you "Deactivate"</em>.'),
                                ),
-
-                'imgdefs'   => array(
-                    'name'  => 'imglong, imgshort',
-                    'title' => 'Default dimensions',
-                    'desc'  => 'These values will be used as the width & height.',
-                    'html'  => array('These values will be used as the width &amp; height in pixels by the <em>Auto determine orientation</em> setting which, if disabled will default to the <code>width</code> in the first box and the <code>height</code> in second box.',
-                                     'NOTE: leave one of the boxes blank (or zero) and it will be calculated using the aspect ratio to the other box.'),
-                               ),
-                'imgaddl'   => array(
-                    'name'  => 'img2long, img2short, img2page',
-                    'title' => 'Additional dimensions',
-                    'desc'  => 'These values will be used as the width & height.',
-                    'html'  => array('These dimenstions are used if you want to specify different settings for the front page or the single display page or everything else.',
-                                     'These values will be used as the width &amp; height in pixels by the <em>Auto determine orientation</em> setting which, if disabled will default to the <code>width</code> in the first box and the <code>height</code> in second box.',
-                                     'NOTE: leave one of the boxes blank (or zero) and it will be calculated using the aspect ratio to the other box.'),
-                               ),
             );
 
@@ -184 +190 @@
 
             add_settings_section('main_section', 'Main settings', array($this, 'admin_overview'), __FILE__);
-            $this-> add_settings(array('capatt'  ), 'print_dropdown', 'main_section');
-            $this-> add_settings(array('newtitle'), 'print_textbox' , 'main_section');
-            $this-> add_settings(array('group'   ), 'print_textbox' , 'main_section');
+            $this-> add_settings(array('capatt'  ), 'print_caption_dd', 'main_section');
+            $this-> add_settings(array('newtitle'), 'print_textbox'   , 'main_section');
+            $this-> add_settings(array('group'   ), 'print_textbox'   , 'main_section');
             $this-> add_settings(array('yankit', 'killanc', 'dofx', 'force'), 'print_checkbox', 'main_section');
 
             add_settings_section('thumb_section', 'Thumbnail settings', array($this, 'admin_overview'), __FILE__);
-            $this-> add_settings(array('stdthumb'), 'print_checkbox', 'thumb_section');
-            $this-> add_settings(array('inspect' ), 'print_checkbox', 'thumb_section');
-            $this-> add_settings(array('imgdefs' ), 'print_img_defs', 'thumb_section');
-            $this-> add_settings(array('imgaddl' ), 'print_img_addl', 'thumb_section');
+            $this-> add_settings(array('stdthumb'), 'print_checkbox'  , 'thumb_section');
+            $this-> add_settings(array('inspect' ), 'print_checkbox'  , 'thumb_section');
+            $this-> add_settings(array('imgdefs' ), 'print_img_defs'  , 'thumb_section');
+            $this-> add_settings(array('imgaddl' ), 'print_img_addl'  , 'thumb_section');
+            $this-> add_settings(array('attthumb' ), 'print_attach_dd', 'thumb_section');
 
             add_settings_section('style_section', 'Styling settings', array($this, 'admin_overview'), __FILE__);
@@ -212 +219 @@
         }
 
-        function print_dropdown ( $f )
+        function print_caption_dd ( $f )
         {
             $sel_tit = ($this->get_option($f) == 'title') ? 'selected="selected"' : '';
@@ -224 +231 @@
                    <option value="alt"   $sel_alt>alt</option>
                    <option value="x"     $sel_non>(x) no caption</option>
+                </select>
+ELEMENT;
+            $this-> print_element($e, $f);
+        }
+
+        function print_attach_dd ( $f )
+        {
+            $sel_thu = ($this->get_option($f) == 'thumbnail') ? 'selected="selected"' : '';
+            $sel_med = ($this->get_option($f) == 'medium'   ) ? 'selected="selected"' : '';
+            $sel_lrg = ($this->get_option($f) == 'large'    ) ? 'selected="selected"' : '';
+            $sel_ful = ($this->get_option($f) == 'fullsize' ) ? 'selected="selected"' : '';
+            $e = <<< ELEMENT
+                <select
+                    id="$f"
+                    name="$this->settings_name[$f]"
+                  ><option value="fullsize"  $sel_ful>full-size</option>
+                   <option value="large"     $sel_lrg>large</option>
+                   <option value="medium"    $sel_med>medium</option>
+                   <option value="thumbnail" $sel_thu>thumbnail</option>
                 </select>
 ELEMENT;

image-formatr/trunk/class.formatr.php

@@ -41 +41 @@
             $this->cap_class       =            $this->get_option('capclass' ); // list of css classes to add to the caption div
             $this->def_group       =            $this->get_option('group'    ); // the default PrettyPhoto grouping designator
+            $this->attach_thumb    =            $this->get_option('attthumb' ); // the size of the attachment image to use as the thumbnail
             $this->new_title       =         __($this->get_option('newtitle' )); // the new title replacement
             $this->def_img_width   = abs(intval($this->get_option('imglong'  )));
@@ -400 +401 @@
             $img_style  = "style=\"$width $height\"";
 
-            // setup print source and id print variables ///////////////
-            $src = $param['thumb'] ? $param['thumb'] : $param['src'];
+            // setup source & id print variables ///////////////////////
+            $thumb = $param['thumb'] ? $param['thumb'] : $this-> get_attachment_url($param);
+            $src = $thumb ? $thumb : $param['src'];
             $id  = $param['id'] ? "id=\"{$param['id']}\""  : "";
 
@@ -459 +461 @@
         }
 
+        /**
+         * Get the attached image url in the specified size
+         *
+         * First we look in the class parameter of the image for the attachment
+         * id and failing this we look in the database. Then we use this id to
+         * try and grab the attached image of that size.
+         */
+        function get_attachment_url( $param )
+        {
+            # first check if the attachment id is available in the image class
+            preg_match('/wp-image-(\d+)/', $param['class'], $matches); // alignnone size-full wp-image-3338
+            if (false and count($matches) > 1){
+                $attachment_id = $matches[1];
+            }
+            # otherwise we need to go to the database to find the id
+            else {
+                global $wpdb;
+                $psrc = $param['src'];
+                $query = "SELECT ID FROM $wpdb->posts WHERE guid='{$param['src']}'";
+                // $debug_sma_eval ='$psrc';$debug_sma_title=__METHOD__.':'.__LINE__;include('debug_output_sma.php'); #SMA
+                // $debug_sma_eval ='$query';$debug_sma_title=__METHOD__.':'.__LINE__;include('debug_output_sma.php'); #SMA
+                $attachment_id = $wpdb->get_var($query);
+            }
+            # if the image has been attached, we should have the id now
+            if ($attachment_id) {
+                $attachment_img_src = wp_get_attachment_image_src($attachment_id, $this-> attach_thumb);
+                // $debug_sma_eval ='$attachment_img_src';$debug_sma_title=__METHOD__.':'.__LINE__;include('debug_output_sma.php'); #SMA
+
+                if ($attachment_img_src and isset($attachment_img_src[0]))
+                    return $attachment_img_src[0];
+            }
+        }
+
     } //End Class ImageFormatr
 

image-formatr/trunk/image-formatr.php

@@ -4 +4 @@
   * Plugin URI: http://warriorself.com/blog/about/image-formatr/
   * Description: Formats all content images on a page / post giving them borders and captions.
-  * Version: 1.0.1
+  * Version: 1.1
   * Author: Steven Almeroth
   * Author URI: http://warriorship.org/sma/
@@ -27 +27 @@
   */
 define ('IMAGEFORMATR_TEXTDOMAIN', 'image-formatr');
-define( 'IMAGEFORMATR_VERSION'   , '1.0.1');
 
 include_once(dirname(__FILE__) . '/class.formatr.php');

image-formatr/trunk/readme.txt

@@ -165 +165 @@
 
 * add screenshot of output image with caption
+* admin options name should be unique (accross all plugins)
 
 == Current Wishlist ==