? .DS_Store
? mm_s3.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.2.2.14.2.3
diff -u -p -r1.1.2.2.2.14.2.3 mm_s3.module
--- mm_s3.module	11 May 2009 17:24:23 -0000	1.1.2.2.2.14.2.3
+++ mm_s3.module	11 Jun 2009 19:47:59 -0000
@@ -75,7 +75,7 @@ function mm_s3_file_perms() {
 /**
  * check and see if the drivers are installed
  */
-function mm_s3_class_check($key = false, $skey = false) {
+function mm_s3_class_check($key = false, $skey = false, $useSSL = false) {
   require_once drupal_get_path('module', 'mm_s3') .'/S3.php';
 
   // Check for CURL
@@ -87,8 +87,9 @@ function mm_s3_class_check($key = false,
   // AWS access info
   if (!defined('awsAccessKey')) define('awsAccessKey', $key ? $key : variable_get('mm_s3_key', null));
   if (!defined('awsSecretKey')) define('awsSecretKey', $skey ? $skey : variable_get('mm_s3_skey', null));
-  $s3 = new S3(awsAccessKey, awsSecretKey);
-
+  if (!defined('awsUseSSL')) define('awsUseSSL', $useSSL ? $useSSL : variable_get('mm_s3_useSSL', null));
+  $s3 = new S3(awsAccessKey, awsSecretKey, awsUseSSL);
+  
   // make sure the connection can be made to S3;
   if ($result = $s3->checkKeys()) {
     drupal_set_message(t('There was an error in your S3 account information: <br />!error: !description <br/>Please update your !settings',
@@ -173,6 +174,13 @@ function mm_s3_settings_form() {
     '#default_value' => variable_get('mm_s3_skey', ""),
     '#description' => t("S3 secret key."),
   );
+
+  $form['mm_s3']['mm_s3_useSSL'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Use SSL'),
+    '#default_value' => variable_get('mm_s3_useSSL', ""),
+    '#description' => t("Use SSL encryption when accessing S3."),
+  );
   return $form;
 }
 
@@ -186,7 +194,7 @@ function mm_s3_admin_validate($element, 
   // only validate if we have both values
   if ($form_state['values']['mm_s3_key'] && $form_state['values']['mm_s3_skey']) {
     // we need to verify the parameters being passed in
-    if (! $s3 = mm_s3_class_check($form_state['values']['mm_s3_key'], $form_state['values']['mm_s3_skey'])) {
+    if (! $s3 = mm_s3_class_check($form_state['values']['mm_s3_key'], $form_state['values']['mm_s3_skey'], $form_state['values']['mm_s3_useSSL'])) {
       form_error($element, '');
       return;
     }