Changeset 395

Timestamp:

05/02/07 14:44:53 (2 years ago)

Author:

louisedade

Message:

avatar-upload: committing version 0.3 with lots of changes

Files:

• avatar-upload/trunk/avatar-upload.php (modified) (10 diffs)
• avatar-upload/trunk/my-plugins/bb-avatar-upload.php (modified) (1 diff)
• avatar-upload/trunk/my-templates/avatar.php (modified) (2 diffs)
• avatar-upload/trunk/readme.txt (modified) (5 diffs)

avatar-upload/trunk/avatar-upload.php

@@ -2 +2 @@
-/*
-Plugin Name: Avatar Upload
-www.classical-webdesigns.co.uk/articles/43_bbpress-plugin-avatar-upload.html
-2
- Admins can configure maximum allowed file size and image dimensions.
+bbpress.org/plugins/topic/46
+3
+
-Author: Louise Dade
-Author URI: http://www.classical-webdesigns.co.uk/
@@ -11 +11 @@
-require_once('./bb-load.php'); // load bbPress config 
-bb_auth(); // logged in?
-
-/* --- CONFIGURATION VARIABLES (you can edit these) --- */
-
-// Avatar folder location (default is 'avatars' in the bbPress root, 'BBPATH')
-// You must create the 'avatars' folder before you install this plugin.
-$avatar_dir = BBPATH . "avatars/"; // remember to include trailing slash
-
-// Define maximum values allowed
-$max_width = 150; // pixels
-$max_height = 150; // pixels
-$max_bytes = 51200; // default is 50 KB (51200 bytes)
-
-// Allowed file extensions (*.gif, *.jpeg, *.jpg, *.png)
-$allowed_extns = array("gif", "jpg", "jpeg", "png");
-
-// Content types -- more stringent check on file types.
-// Eg. a file with a '.png' extension MUST have an 'image/png' content-type!
-// You probably want to leave this alone.
-$allowed_types = array('gif'=>"image/gif", 'jpeg'=>"image/jpeg", 'jpg'=>"image/jpeg", 'png'=>"image/png");
-
-/* --- STOP EDITING --- */
-
-/* --- Start bbPress Stuff --- */
-
-// If the script filename is not correct.
-$file = '';
-foreach ( array($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_FILENAME'], $_SERVER['SCRIPT_NAME']) as $name ) {
-        if ( false !== strpos($name, '.php') ) {$file = $name;}
-}
-if (bb_find_filename($file) != 'avatar-upload.php') { // not the correct form!
-        $sendto = bb_get_option('uri');
-        wp_redirect( $sendto );
-}
-
-// Grab user id
@@ -52 +19 @@
-}
-
+// This user may NOT be the user who's avatar is being uploaded,
+// this allows an Admin/Moderator to update another user's avatar
+// (in the event that the user's avatar is objectionable!)
+$current_user = bb_get_user(bb_get_current_user_info('id'));
+
+// User who's profile is being updated
-$user = bb_get_user( $user_id ); // user info
-
+// No user found with that ID
-if ( !$user ) {
-        bb_die(__('User not found.')); // no user found
-}
-
-Do not let users upload an avatar if user is a bozo OR user id not equal to current user's i
-(AND user is not allowed to moderate).
-$user->is_bozo || ($user->ID != bb_get_current_user_info( 'id' ) && !bb_current_user_can( 'moderate' ))
+Only allow the correct User or an Admin/Moderator to uploa
+but not if they are a bozo!
+($user->ID != $current_user->ID && !bb_current_user_can( 'moderate' )) || $current_user->is_bozo
-{
-        bb_die(__('You do not have permission to upload an avatar for this user.'));
-}
-/* --- End bbPress Stuff --- */
-
-
-
+
+
+
+
-
-// Some potential error messages in human readable form
-$errorcodes = array(
-        "- no error (this message will never be shown) -",
-$max_kbytes
-$max_kbytes
+{$av_opts['max_kbytes']}
+{$av_opts['max_kbytes']}
-        "The file was only partially uploaded - the connection may have been interrupted.",
-        "The image file does not appear to have been uploaded - did you select an image?",
-        "The file does not appear to be a valid GIF, JPG/JPEG or PNG image type.",
-        "The image file could not be saved to the avatars folder.",
-$max_width x $max_height
+{$av_opts['max_width']} x {$av_opts['max_height']}
-        "The avatar filename may only contain upper/lower case letters, numbers, underscores or dashes."
-);
@@ -86 +61 @@
-if (!empty($_FILES['p_browse']))
-{
-explode("|", $user->avatar_file
+avatarupload_get_avatar($user_id, 0, 1
-
-        $img_errs = 0;
@@ -116 +91 @@
-        }
-
-max_bytes
+av_opts['max_bytes']
-                // File size exceeds max_bytes
-                $img_errs = 1;
@@ -122 +97 @@
-        }
-
-
-
-
-
-
-
-
-
+
+
+
-                $img_errs = 5;
-                $error++;
@@ -151 +121 @@
-                $img_h = $dims[1];
-
-
+
+
-                        $img_errs = 7;
-                        $error++;
@@ -157 +128 @@
-        }
-
-$avatar_dir
+BBPATH . $av_opts['avatar_dir']
-        { // Can save to avatars folder (does it exist?)
-                $img_errs = 6;
@@ -169 +140 @@
-                {       // compare 'new' and 'current' avatar filenames - if different, delete 'current'
-                        // this will most likely only happen when the new avatar has a different extension
-. "avatars/"
+ . $av_opts['avatar_dir']
-                }
-
-
+ . "|avatar-upload"
-                bb_update_usermeta( $user_id, 'avatar_file', $meta_avatar );
-                $success_message = "Your avatar has been uploaded.";
@@ -178 +149 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
+
-?>

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

@@ -2 +2 @@
-/*
-Plugin Name: Avatar Upload
-www.classical-webdesigns.co.uk/articles/43_bbpress-plugin-avatar-upload.html
-2
- Admins can configure maximum allowed file size and image dimensions.
+bbpress.org/plugins/topic/46
+3
+
-Author: Louise Dade
-Author URI: http://www.classical-webdesigns.co.uk/
-*/
-
+// Configuration Settings
+function avatarupload_config()
+{
+        return array(
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-explode("|", $avatar
+avatarupload_get_avatar($id
-        {
-bb_get_option('uri').'avatars/'.
+
-                echo ($status == 'new') ? '?'.time() : '';
-                echo'" width="'.$a[1].'" height="'.$a[2].'" alt="Avatar" />';
+        } else {
+                $config = avatarupload_config();
+                $default = $config['default_avatar'];
+                if ($default['use_default'] == 1)
+                {
+                        echo '<img src="'.$default['uri'].'" width="'.$default['width'].'" height="'.$default['height']
+                        .'" alt="'.$d['alt'].'" />';
+                }
-        }
-}
-
-
+
+
-{
-
+
+
+
-        {
-
-
-
+
+
+
+
+
-        }
+        else
+        {
+                $bb_query = "SELECT meta_value FROM $bbdb->usermeta WHERE meta_key='avatar_file' AND user_id='$id' LIMIT 1";
+
+                if ( $avatar = $bbdb->get_results($bb_query) ) {
+                        $a = explode("|", $avatar[0]->meta_value);
+                } else {
+                        return false;
+                }
+        }
+        
+        // do we want the full uri?
+        if ($fulluri == 1)
+        {
+                $config = avatarupload_config();
+                $a[0] = bb_get_option('uri') . $config['avatar_dir'] . $a[0];
+        }
+        return $a;
-}
-
-
+
+
-{
-
-
-
-
-
-
-
-
-
+
-}
+add_action( 'bb_profile_menu', 'add_avatar_tab' );
-
-?>

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

@@ -1 +1 @@
-<?php bb_get_header(); ?>
-
-id="bread
+class="bb
-
-<?php if (bb_current_user_can('edit_user', $user->ID)) { ?>
-
-<?php
-$success_message
+'<div class="notice">'.__($success_message).'</div>'
-?>
-
@@ -12 +12 @@
-
-<ul>
-The following image formats are allowed: <strong><?php echo implode($img_requirements['img_types'], ", "); ?></strong>.
-Dimensions must be no greater than <strong><?php echo $img_requirements['max_width']; ?> x <?php echo $img_requirements['max_height']; ?> pixels</strong> (your image does not have to be square).
-File size must be no greater than <strong><?php echo $img_requirements['max_kbytes']; ?> <abbr title="kilobytes">KB</abbr></strong
-File names must be <strong>alpha-numeric</strong> and may contain <strong>underscores or dashes</strong> (a-z/A-Z, 0-9, _ or -).
+<?php _e('The following image formats are allowed: <strong>' . implode($av_opts['file_extns'], ", ") . '</strong>.'); ?>
+<?php _e('Dimensions must be no greater than <strong>' .$av_opts['max_width']. ' x ' .$av_opts['max_height']. ' pixels</strong> (your image does not have to be square).'); ?>
+<?php _e('File size must be no greater than <strong>' . $av_opts['max_kbytes'] . '<abbr title="kilobytes">KB</abbr></strong>'); ?
+<?php _e('File names must be <strong>alpha-numeric</strong> and may contain <strong>underscores or dashes</strong> (a-z/A-Z, 0-9, _ or -).'); ?>
-</ul>
-
-echo bb_get_option('uri') . 'avatar-upload.php?id=' . $user->ID
-Locate Image
-img_requiremen
+profile_tab_link($user->ID, 'avatar')
+<?php _e('Locate Image'); ?>
+av_op
-<input type="file" name="p_browse" id="p_browse" size="80" /></p>
-
-Upload Avatar
+<?php _e('Upload Avatar'); ?>
-</form>
-
-Your Current Avatar
-display_avatar
+<?php _e('Your Current Avatar'); ?>
+avatarupload_display
-
-<?php } ?>

avatar-upload/trunk/readme.txt

@@ -4 +4 @@
-Requires at least: 0.8
-Tested up to: 0.8.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.
@@ -10 +10 @@
-== Description ==
-
-
+
+
+
-
-Allows users to upload an avatar (gif, jpeg/jpg or png) image to bbPress, and provides template functions to display the uploaded image.
@@ -17 +19 @@
-* Bozos can not upload avatars.
-* Admins can configure maximum allowed file size (bytes) and dimensions (pixels) of images.
-
+ly
-* Anybody with the 'moderate' capability can upload another user's avatar
-  - this to ensures that inappropriate images can be removed.
-
+
+
+
-
-== Installation ==
-
-1. Create a folder to store your avatars. A folder called "avatars" in the root directory of your bbPress installation is probably best (and the default)
+UPGRADING?  If you are using an older version of this plugin, you need to follow these installation instructions because the template functions are incompatible with the older version
-
-2. Open up the 'avatar-upload.php' file and configure the "configuration Variables" (if desired). At least make sure the '$avatar_dir' path
+1. Open up the 'my-plugins/bb-avatar-upload.php' file and configure the "configuration Setting" (if desired). At least make sure the '$avatar_dir' variable
-
-3. Open up your 'profile-edit.php' template and
+2. The avatar upload page should appear as a tab ("Avatar") on the Profile menu on the user's profile pages.  If you like the link elsewhere, then
-
-echo bb_get_option('uri').'avatar-upload.php?id='.$user->ID; ?>">Upload Avatar
+profile_tab_link($user->ID, 'avatar'); ?>"><?php _e("Upload Avatar"); ?>
-
-
+
+
+
-
-   a) On the user's profile page ('profile.php' template).
-      
-display_avatar_profile($user->avatar_file
+avatarupload_display($user->ID
-
-      This grabs the avatar info file directly from the current user's profile information.
@@ -42 +48 @@
-   b) On each user's forum posts ('post.php' template)
-
-display_avatar
+avatarupload_display
-
-   This function queries the database for any user's ID. In this particular case the post author's id
+You can include the avatar anywhere else you like, just be sure to have either the current or any user's ID available
-
-
+
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-That's it, the 'Avatar Upload' plugin should now be working.
@@ -70 +83 @@
-== Change Log ==
-
-
-
+
+
+
+
+