? .svn
? mm_s3.module.andy
? s3_perms.patch
Index: mm_s3.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media_mover/contrib/mm_s3/Attic/mm_s3.module,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 mm_s3.module
--- mm_s3.module	22 Mar 2009 16:13:43 -0000	1.1.2.10
+++ mm_s3.module	2 Oct 2009 19:33:01 -0000
@@ -189,6 +189,7 @@ function _mm_s3_config($action_id, $conf
     '#title' => t('S3 File Permissions'),
     '#default_value' => $configuration['mm_s3_perm'] ? $configuration['mm_s3_perm'] : 'ACL_PUBLIC_READ',
     '#description' => t("Set the permissions on your uploaded files."),
+    '#options' => $options,
   );
   $form['mm_s3']['mm_s3_delete_source'] = array(
     '#type' => 'checkbox',
@@ -286,20 +287,20 @@ function _mm_s3_send($file, $configurati
   $perms = $configuration['mm_s3_perm'] ? $configuration['mm_s3_perm'] : ACL_PUBLIC_READ;
 
   // create the bucket if it does not exist
-  $s3->putBucket($bucket, S3::$perms);
+  $s3->putBucket($bucket, constant('S3::'. $perms));
 
   // Put file on amazon (also with public read access)
-  $s3->putObjectFile($file_path, $bucket, basename($file_path), S3::$perms);
+  $s3->putObjectFile($file_path, $bucket, basename($file_path), constant('S3::'. $perms));
 
   // Make sure the file made it to amazon
   $info = $s3->getObjectInfo($bucket, basename($file_path));
+
   // Error check
   if (! $info['hash']) {
     // Error condition when trying to put file up
-    $message = 'media_mover s3 could not upload file to amazon. Reporting error: @error';
-    $variables = array('@error' => print_r($s3, true));
+    $message = 'media_mover s3 could not upload file to amazon. Reporting error: ' . print_r($info, true);
     $link = l('Change S3 Settings',  'admin/settings/media_mover');
-    watchdog('MM S3', $message, $variables, WATCHDOG_ERROR, $link);
+    watchdog('MM S3', $message, WATCHDOG_ERROR, $link);
     return false;
   }
 
@@ -310,7 +311,7 @@ function _mm_s3_send($file, $configurati
       foreach ($actions as $action => $items) {
         foreach ($items as $id => $item) {
           // now we move these files to amazon
-          $s3->putObjectFile($item, $bucket, basename($item), S3::$perms);
+          $s3->putObjectFile($item, $bucket, basename($item), constant('S3::'. $perms));
           $display['display'][$module_name][$id] =  "http://s3.amazonaws.com/". $bucket ."/". basename($item);
         }
       }