Changeset 671

Timestamp:

09/09/07 16:57:42 (1 year ago)

Author:

louisedade

Message:

avatar-upload: committing version 0.8.3 - added thumbnail feature (undocumented)

Files:

• avatar-upload/trunk/additional-files/avatar-upload.php (modified) (5 diffs)
• avatar-upload/trunk/additional-files/my-templates/avatar.php (modified) (1 diff)
• avatar-upload/trunk/bb-avatar-upload.php (modified) (4 diffs)
• avatar-upload/trunk/readme.txt (modified) (1 diff)

avatar-upload/trunk/additional-files/avatar-upload.php

@@ -34 +34 @@
-if (!empty($_FILES['p_browse']))
-{
-
+
+
-
-        // Grab the uploaded image
@@ -82 +83 @@
-                        $img_size = @filesize($img_temp);
-                        list($img_w, $img_h) = $resized; // overwrite image width / height
+
+
+                        // Do we want a thumbnail and was it successful?
+                        if  ($config->use_thumbnail == 1)
+                        {
+                                $thumb_file = BBPATH . $config->avatar_dir . "thumb." . $user_filename;
+
+                                if ( !$thumbresized = avatar_thumbnail($img_temp, $img_w, $img_h, $img_type, $thumb_file) )
+                                {
+                                        $img_errs = 12;
+                                }
+                        }
+
-                }
-        }
@@ -101 +115 @@
-        {
-                // Compare 'new' and 'current' avatar filenames
-[0]) && $user_filename != $current_avatar[0]
+) && $user_filename != $current_avatar
-                {
-                        // If different, delete 'current' - this will only occur when
-                        // the new and current avatars have different file extensions.
-
+
+
-                }
-
@@ -150 +165 @@
-                        case 11: // custom error code
-                                $error_message = __("The file could not be saved to the {$config->avatar_dir} folder.");
+                                break;
+                        case 12: // custom error code
+                                $error_message = __("The thumbnail file could not be saved to the {$config->avatar_dir} folder.");
-                                break;
-                        default: // unknown error (this probably won't ever happen)
@@ -261 +279 @@
-}
-
+
+/* Image thumbnail */
+function avatar_thumbnail($img_temp, $img_w, $img_h, $img_type, $img_thumb_name)
+{
+        global $config;
+
+        // if either the image width or height is greater than the maximums allowed
+        if ($img_w > $config->thumb_width || $img_h > $config->thumb_height)
+        {
+                // To maintain aspect ratio we need to resize proportionally
+
+                if ($img_w > $img_h)
+                {
+                        // width is greater - make width 'max_width' and proportion height
+                        $new_width = $config->thumb_width;
+                        $new_height = round($img_h * ($config->thumb_width/$img_w));
+                }
+                else if ($img_w < $img_h)
+                {
+                        // height is greater - make height 'max_height' and proportion width
+                        $new_width = round($img_w * ($config->thumb_height/$img_h));
+                        $new_height = $config->thumb_height;
+                }
+                else
+                {
+                        // equal (square) - make both 'max' values
+                        $new_width = $config->thumb_width;
+                        $new_height = $config->thumb_height;
+                }
+        }
+        else
+        {
+                // image already within maximum limits - do not resize
+                $new_width = $img_w;
+                $new_height = $img_h;
+        }
+
+        // Thumbnail coordinates if width/height smaller than max thumb size
+        // because we want a square thumb image.
+        $x_start = ($config->thumb_width - $new_width > 0) ? round(($config->thumb_width - $new_width)/2) : 0;
+        $y_start = ($config->thumb_height - $new_height > 0) ? round(($config->thumb_height - $new_height)/2) : 0;
+
+        // Can we use a truecolor image?
+        $truecolor = function_exists('imagecreatetruecolor');
+
+        // Resize the image, preserving image type
+
+        switch ($img_type)
+        {
+                case 1:
+                        // GIF
+                        $im1 = @imagecreatefromgif($img_temp);
+                        $im2 = @imagecreate($config->thumb_width, $config->thumb_height) or $error = 1;
+                        $bg = @imagecolorallocate($im2, 192, 192, 192); // default background color
+                        @imagecolortransparent($im2, $bg); // make it transparent
+                        @imagecopyresampled ($im2, $im1, $x_start, $y_start, 0, 0, $new_width, $new_height, $img_w, $img_h);
+                        @imagegif($im2, $img_thumb_name);
+                        break;
+
+                case 2:
+                        // JPEG
+                        $im1 = @imagecreatefromjpeg($img_temp);
+                        $im2 = ($truecolor) ? @imagecreatetruecolor($config->thumb_width, $config->thumb_height) : @imagecreate($config->thumb_width, $config->thumb_height);
+                        @imagecopyresampled ($im2, $im1, $x_start, $y_start, 0, 0, $new_width, $new_height, $img_w, $img_h);
+                        $im2 = ($truecolor) ? do_unsharp_mask($im2, $config->use_unsharpmask) : $im2;
+                        @imagejpeg($im2, $img_thumb_name, 100); // quality integer might become config variable
+                        break;
+
+                case 3:
+                        // PNG
+                        $im1 = @imagecreatefrompng($img_temp);
+                        $im2 = ($truecolor) ? @imagecreatetruecolor($config->thumb_width, $config->thumb_height) : @imagecreate($config->thumb_width, $config->thumb_height);
+                        $bg = @imagecolorallocate($im2, 192, 192, 192); // default background colour
+                        @imagecolortransparent($im2, $bg); // make it transparent
+                        @imagealphablending($im2, false); // stop alpha blending
+                        @imagesavealpha($im2, true); // save original image alpha channel
+                        @imagecopyresampled ($im2, $im1, $x_start, $y_start, 0, 0, $new_width, $new_height, $img_w, $img_h);
+                        $im2 = ($truecolor) ? do_unsharp_mask($im2, $config->use_unsharpmask) : $im2;
+                        @imagepng($im2, $img_thumb_name);
+                        break;
+
+                default:
+                        $error = 1;
+                        break;
+        }
+
+        @imagedestroy($im2);
+        @imagedestroy($im1);
+
+        if ($error > 0)
+        {
+                // Something went wrong.
+                return false;
+        } else {
+                // return the new sizes
+                return array($new_width, $new_height);
+        }
+}
+
-?>

avatar-upload/trunk/additional-files/my-templates/avatar.php

@@ -29 +29 @@
-<h3><?php _e('Current Avatar'); ?></h3>
-
-
+
+
+
+
+
+
+
-
-<?php if (!usingidenticon($user->ID)) { ?>

avatar-upload/trunk/bb-avatar-upload.php

@@ -3 +3 @@
-Plugin Name: Avatar Upload
-Plugin URI: http://bbpress.org/plugins/topic/46
-2
+3
-Description: Allows users to upload an avatar (gif, jpeg/jpg or png) image to bbPress.
-Author: Louise Dade
@@ -51 +51 @@
-                $this->use_unsharpmask = 1;
-                
+                // Use a thumbnail image (hidden feature for now). 1 = yes / 0 = no (default)
+                $this->use_thumbnail = 0;
+                $this->thumb_width = 25;
+                $this->thumb_height = 25;
+
-                // Default avatar - set 'use_default' to '0' to display Identicon instead of default
-                // The default URI is in the '$this->avatar_dir' folder.
@@ -102 +107 @@
-}
-
+// Display the avatar image
+function avatarupload_displaythumb($id, $force_db=0, $class='avatar_thumb')
+{
+        $config = new avatarupload_config();
+
+        if ($a = avatarupload_get_avatar($id,1,$force_db, 1))
+        {
+                echo '<img src="'.$a[0].'" width="'.$config->thumb_width.'" height="'.$config->thumb_height.'" alt="'.$a[4].'" class="'.$class.'" />';
+        }
+}
+
-// Get the avatar URI ($id = user->ID, $fulluri = full url to image,
-// $force_db = get avatar from database where 'usermeta' not already available)
-
+, $is_thumb=0
-{
-        global $bbdb, $user;
@@ -132 +148 @@
-                        return false;
-                }
+        }
+
+        if ($is_thumb == 1)
+        {
+                $a[0] = "thumb.".$a[0];
-        }
-

avatar-upload/trunk/readme.txt

@@ -4 +4 @@
-Requires at least: 0.8.2
-Tested up to: 0.8.2.1
-2
+3
-
-Allows users to upload an avatar (gif, jpeg/jpg or png) image to bbPress. Admins can configure maximum allowed file size and image dimensions. Includes fel64's code enabling 'Identicons' - default avatars made of abstract patterns unique to each user.