Various fixes, make module useful

@mikejonesok
Interesting... Code that skips approvals is in the patch, and it works on my site:

@@ -129,6 +139,11 @@ function avatarapproval_user($op, &$edit
     case 'update':
       //If an image has been uploaded
       if(file_exists($edit['picture'])) {
+        // Check if some other module is supplying avatars.
+	// Our assumption that other module takes care of approvals, 
+	// so we don't stand in the way.
+	if (FALSE === strstr($edit['picture'], avatarapproval_get_directory())) return;

Can you verify that the patch applied completely? If yes, what is your version of avatar_selection module?

@dalad
Thanks for updating the module!

Sorry, did not notice your post right away - once closed, the issue disappears from the radar. I usually set my issues to "fixed" and let the system automatically close them in two weeks.

I downloaded the latest module and checked it on my site. #437802 and #716470 fixes are working, but your version of fix for #716402 does not work - images in the approval queue are back to broken.

I reinserted this code:

// [iva2k] fixing #716402:
      '#value' => theme('image', file_create_url($picture_directory . $avatar->md5 . '.' . $avatar->extension), '', '', '', FALSE));

into avatarapproval_admin_overview_form() function and it works again.

I think the problem with function avatarapproval_file_download() is that it only can change content type or disallow viewing the file, but the actual image url stays broken without the above fix, which ensures proper path by applying file_create_url().

I took the liberty of reopening this issue so the submitted patch can be tracked until it is resolved. I suggest moving to individual issues if only a separate patch needs to be submitted. Of course if you want otherwise - that's fine with me too.

@dalad
> What you say is really suprising me. Would you believe me if I say that your fix was not able to resolve 716402 on my system?
I'm not surprised at all - perhaps there are two separate issues that can cause broken images with private uploads.

My setup is Ubuntu/LAMP, PHP 5.2.6-2ubuntu4.2 with drupal 6.15, just upgraded to 6.16. I have .htaccess customization in sites/default/files:

SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
Options None
Options +FollowSymLinks

# Redirect all files from public to private download. Private download must be enabled.
<IfModule mod_rewrite.c>
  RewriteEngine on
  RewriteBase /system/files
  RewriteCond %{REQUEST_URI} !^/sites/default/files/color/.*$
  RewriteCond %{REQUEST_URI} !^/sites/default/files/css/.*$
  RewriteCond %{REQUEST_URI} !^/sites/default/files/js/.*$
  RewriteCond %{REQUEST_URI} !^/sites/default/files/ctools/.*$
  RewriteRule ^(.*)$ $1 [L,R=301]
</IfModule>

> At this point, good thing is to apply both fixes.
I agree. I don't see any adverse effects of file_download(), and it makes sense to have it since intermediate files are created by Avatar Approval, so it has to respond to this hook to let the file system know what to do with these files.

@dalad
Makes perfect sense. So I gather you agreed to include the other fix (file_create_url) - did I get that right?

Ok, I'll wait for the snapshot or release to come out and will try it.