Changeset 912315

Timestamp:

05/12/2014 12:19:57 AM (11 years ago)

Author:

huntermaster

Message:

1.1.4 link gallery imgs to prettyphoto

Location:

image-formatr/trunk

Files:

• image-formatr.php (modified) (1 diff)
• src/class.base.php (modified) (1 diff)
• src/class.flickr.php (added)
• src/class.formatr.php (modified) (6 diffs)

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.1.3
+  * Version: 1.1.4
   * Author: Steven Almeroth
   * Author URI: http://warriorself.com/sma/

image-formatr/trunk/src/class.base.php

@@ -193 +193 @@
 
             return $this->get_inner_html($body);
+        }
+
+        /**
+         * 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;
+                $query = "SELECT ID FROM $wpdb->posts WHERE guid='{$param['src']}'";
+                $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);
+
+                if ($attachment_img_src and isset($attachment_img_src[0]))
+                    return $attachment_img_src[0];
+            }
         }
 

image-formatr/trunk/src/class.formatr.php

@@ -1 +1 @@
 <?php
-require_once(dirname(__FILE__) . '/class.admin.php');
+require_once(dirname(__FILE__) . '/class.flickr.php');
 
 if (!class_exists("ImageFormatr")) {
-    class ImageFormatr extends ImageFormatrAdmin {
+    class ImageFormatr extends ImageFormatrFlickr {
 
         // html image tag attributes
@@ -130 +130 @@
 
         /**
-         * Request and load the data from Flickr which we only want to do
-         * once.  Unfortunately I could not find an API call to search for
-         * a list of Ids, therefore we're searching for all damn photos for
-         * our user and then indexing those for the ones we want.
-         */
-        function load_flickr_data ( )
-        {
-            if ( $this-> flickr-> loaded) return true;
-            if (!$this-> flickr-> enable) return false;
-            $this-> flickr-> loaded = true;
-            $this-> flickr_photos = array();
-            $page = 0;
-
-            $params = array(
-                'user_id'        => $this-> flickr-> nsid,
-                'auth_token'     => $this-> flickr-> token,
-                'extras'         => 'last_update,tags,url_m,url_l',
-                'privacy_filter' =>  1, // 1 == public photos
-                'content_type'   =>  1, // 1 == photos only
-                'per_page'       =>  500, // we can only return 500 at a time max
-                );
-            $flickr_photos = array();
-            $finished = false;
-            while (!$finished) {
-                $params['page'] = ++$page;
-                $response = $this-> call_flickr_api('flickr.photos.search', $params, true );
-                if ($response['stat'] == 'ok' and
-                    $response['photos']['photo']) {
-                        $flickr_photos = array_merge ($flickr_photos, $response['photos']['photo']);
-                }
-                if (count($response['photos']['photo']) < 500)
-                    $finished = true;
-            }
-
-            foreach ($flickr_photos as $photo) {
-                $this-> flickr_photos[$photo['id']] = $photo;
-            }
-
-            return count($this->flickr_photos);
-        }
-
-        /**
-         * Process the [flickr] shortcodes
-         *
-         * [0] => [flickr pid="5496015411"]
-         * [1] => 5496015411
-         */
-        function do_shortcode_flickr ( $matches )
-        {
-            if( count($matches) < 2 ) return '';
-            if( !$this->load_flickr_data() ) return '';
-
-            #return do_shortcode($matches[0]);
-            if( array_key_exists( $matches[1], $this->flickr_photos ) )
-                $html = <<< IMAGE
-                    <img src   ="{$this->flickr_photos[$matches[1]]['url_l']}"
-                         thumb ="{$this->flickr_photos[$matches[1]]['url_m']}"
-                         alt   ="{$photo['tags']}"
-                    />
-IMAGE;
-            return $html;
-        }
-
-        /**
-         * Process the [flickrset] shortcodes
-         *
-         * [0] => [flickrset id="72157626094257379"]
-         * [1] => 72157626094257379
-         */
-        function do_shortcode_flickrset ( $matches )
-        {
-            if( count($matches) < 2 ) return '';
-
-            $params = array(
-                'photoset_id'    => $matches[1],
-                'auth_token'     => $this->flickr->token,
-                'extras'         => 'last_update,tags,url_sq,url_l',
-                'privacy_filter' =>  1, // 1 == public photos
-                );
-            $photoset = $this-> call_flickr_api( 'flickr.photosets.getPhotos', $params, true );
-
-            $html = '';
-            foreach ($photoset['photoset']['photo'] as $photo) {
-               #$src = $this->flickr_core->getPhotoUrl($photo);
-                $html .= <<< IMAGE
-                    <img src    ="{$photo['url_l']}"
-                         thumb  ="{$photo['url_sq']}"
-                         alt    ="{$photo['tags']}"
-                         width  ="{$photo['width_sq']}"
-                         height ="{$photo['height_sq']}"
-                         usemysize="true"
-                    />
-IMAGE;
-            }
-            return $html;
-        }
-
-        /**
          * Parse the image markup tags
          *
@@ -334 +236 @@
          * Format the html output
          *
+         * [alt] => IMG_4308
+         * [asis] => 
+         * [class] => attachment-thumbnail
+         * [flickr] => 
+         * [group] => main
+         * [height] => 150
+         * [hint] => 
+         * [id] => 
+         * [link] => 
+         * [nocap] => 
+         * [nofx] => 
+         * [page] => 
+         * [src] => /wp-content/uploads/2014/05/IMG_4308-150x150.jpg
+         * [thumb] => 
+         * [title] => 
+         * [usemya] => 
+         * [usemysize] => 
+         * [width] => 150
+         * [anchor] => <a href='/wp-content/uploads/2014/05/IMG_4308.jpg'>
+         * [none] => 
+         *
          * @param array $param The image attributes/parameters as an associative array
          * @return string The screen markup
@@ -339 +262 @@
         function format ( $param )
         {
+#global $post;
+#$debug_sma_eval ='$param'; $debug_sma_title =__METHOD__; include('debug_output_sma.php');
+#$debug_sma_eval ='$param["anchor"]'; $debug_sma_title =__METHOD__; include('debug_output_sma.php');
+#$debug_sma_eval ='wp_kses($param["anchor"], array("a" => array("href" => array(), "title" => array())), array("http"))'; $debug_sma_title =__METHOD__; include('debug_output_sma.php');
+#$debug_sma_eval ='wp_kses_hair($param["anchor"], array("http","https","ftp","file"))'; $debug_sma_title =__METHOD__; include('debug_output_sma.php');
+#$debug_sma_eval ='wp_kses_split($param["anchor"], array("a" => array("href" => array(), "title" => array())), array("http","https","ftp","file"))'; $debug_sma_title =__METHOD__; include('debug_output_sma.php');
+#preg_match("%href='([^']+)'%", $param["anchor"], $matches);
+#$debug_sma_eval ='$matches'; $debug_sma_title =__METHOD__; include('debug_output_sma.php');
+
             // setup dimensions width & height /////////////////////////////////
 
@@ -348 +280 @@
                 $img_width  = $this->def_img_width;
                 $img_height = $this->def_img_height;
+            }
+
+            // re-link gallery images
+            if ($param['class'] == 'attachment-thumbnail' and !$param['thumb']) {
+                preg_match("%href='([^']+)'%", $param["anchor"], $matches);
+                if ($matches)
+                    $param['thumb'] = $param['src'];
+                    $param['src'] = $matches[1];
+#$debug_sma_eval ='$param'; $debug_sma_title =__METHOD__; include('debug_output_sma.php');
             }
 
@@ -446 +387 @@
         }
 
-        /**
-         * 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;
-                $query = "SELECT ID FROM $wpdb->posts WHERE guid='{$param['src']}'";
-                $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);
-
-                if ($attachment_img_src and isset($attachment_img_src[0]))
-                    return $attachment_img_src[0];
-            }
-        }
-
     } //End Class ImageFormatr