tantan-s3/wordpress-s3/admin-options.html tantan-s3a/wordpress-s3/admin-options.html
*** tantan-s3/wordpress-s3/admin-options.html   Tue Jan 27 09:53:18 2009
--- tantan-s3a/wordpress-s3/admin-options.html  Tue Dec  8 13:25:59 2009
***************
*** 153,159 ****
        <th width="33%" scope="row">Host name settings:</th> 
        <td>
                <input type="checkbox" name="options[virtual-host]" value="1" id="virtual-host" <?php echo ($options['virtual-host'] ? 'checked="checked" ' : '');?> />
!                       <label for="virtual-host"> Bucket is setup for virtual hosting.</label> (<a href="http://docs.amazonwebservices.com/AmazonS3/2006-03-01/VirtualHosting.html">more info</a>)
        </td> 
        </tr>
  
--- 153,161 ----
        <th width="33%" scope="row">Host name settings:</th> 
        <td>
                <input type="checkbox" name="options[virtual-host]" value="1" id="virtual-host" <?php echo ($options['virtual-host'] ? 'checked="checked" ' : '');?> />
!                       <label for="virtual-host"> Bucket is setup for virtual hosting.</label> (<a href="http://docs.amazonwebservices.com/AmazonS3/2006-03-01/VirtualHosting.html">more info</a>)<br />
! CloudFront distribution hostname: <input type="text" name="options[cloudfront]" value="<?php echo $options['cloudfront'];?>" size="20" /><small>(Leave blank if not using)</small><br />
! CloudFront CNAMEs: <input type="text" name="options[cnames]" value="<?php echo $options['cnames'];?>" size="50" /><small>(Separate with spaces or commas)</small>
        </td> 
        </tr>
  
***************
*** 214,217 ****
  
  
  
! </div>
--- 216,219 ----
  
  
  
! </div>
diff -c tantan-s3/wordpress-s3/class-plugin-public.php tantan-s3a/wordpress-s3/class-plugin-public.php
Warning: missing newline at end of file tantan-s3/wordpress-s3/class-plugin-public.php
*** tantan-s3/wordpress-s3/class-plugin-public.php      Tue Jan 27 09:53:18 2009
--- tantan-s3a/wordpress-s3/class-plugin-public.php     Tue Dec  8 13:20:31 2009
***************
*** 19,29 ****
          if (!$this->options) $this->options = get_option('tantan_wordpress_s3');
          
          if ($this->options['wp-uploads'] && ($amazon = get_post_meta($postID, 'amazonS3_info', true))) {
!             $accessDomain = $this->options['virtual-host'] ? $amazon['bucket'] : $amazon['bucket'].'.s3.amazonaws.com';
!             return 'http://'.$accessDomain.'/'.$amazon['key'];
          } else {
              return $url;
          }
      }
  }
! ?>
--- 19,38 ----
          if (!$this->options) $this->options = get_option('tantan_wordpress_s3');
          
          if ($this->options['wp-uploads'] && ($amazon = get_post_meta($postID, 'amazonS3_info', true))) {
!             if ($this->options['cloudfront']) {
!                 $cfname = $this->options['cloudfront'];
!                 if ($this->options['cnames']) {
!                   $cnames = preg_split("/[\s,]+/", $this->options['cnames']);
!                   $cfname = array_rand(array_flip($cnames), 1);
!                 } 
!                 return 'http://'.$cfname.'/'.$amazon['key'];
!             } else {
!                 $accessDomain = $this->options['virtual-host'] ? $amazon['bucket'] : $amazon['bucket'].'.s3.amazonaws.com';
!                 return 'http://'.$accessDomain.'/'.$amazon['key'];
!             }
          } else {
              return $url;
          }
      }
  }
! ?>
diff -c tantan-s3/wordpress-s3/class-plugin.php tantan-s3a/wordpress-s3/class-plugin.php
*** tantan-s3/wordpress-s3/class-plugin.php     Tue Jan 27 09:53:18 2009
--- tantan-s3a/wordpress-s3/class-plugin.php    Tue Dec  8 13:15:33 2009
***************
*** 98,106 ****
                  $message = "Saved Amazon S3 authentication information. ";
              }
              if (function_exists('dns_get_record') && $_POST['options']['virtual-host']) {
!                 $record = dns_get_record($_POST['options']['bucket']);
!                 if (($record[0]['type'] != 'CNAME') || ($record[0]['target'] != $_POST['options']['bucket'].'s3.amazonaws.com')) {
!                     $error = "Warning: Your DNS doesn't seem to be setup correctly to virtually host the domain <em>".$_POST['options']['bucket']."</em>. ".
                                                "Double check and make sure the following entry is added to your DNS. ".
                                                "<a href='http://docs.amazonwebservices.com/AmazonS3/2006-03-01/VirtualHosting.html'>More info &gt;</a>".
                                                "<br /><br />".
--- 98,123 ----
                  $message = "Saved Amazon S3 authentication information. ";
              }
              if (function_exists('dns_get_record') && $_POST['options']['virtual-host']) {
!                 if ($_POST['options']['cloudfront']) {
!                     if ($_POST['options']['cnames']) {
!                         $cnames = preg_split("/[\s,]+/", $_POST['options']['cnames']);
!                         foreach ($cnames as $cname) {
!                             $record = dns_get_record($cname);
!                             if (($record[0]['type'] != 'CNAME') || ($record[0]['target'] != $_POST['options']['cloudfront'])) {
!                                 $error = "Warning: Your DNS doesn't seem to be setup correctly to virtually host the domain <em>".$_POST['options']['cloudfront']."</em>. ".
!                                       "Double check and make sure the following entry is added to your DNS. ".
!                                       "<a href='http://docs.amazonwebservices.com/AmazonS3/2006-03-01/VirtualHosting.html'>More info &gt;</a>".
!                                       "<br /><br />".
!                         "<code>".$cname." CNAME ".$_POST['options']['cloudfront']."</code>".
!                                       "<br /><br />".
!                                       "<small>You can ignore this message if you're sure everything is setup correctly.</small>";
!                               }
!                           }
!                       }
!                 } else {
!                   $record = dns_get_record($_POST['options']['bucket']);
!                   if (($record[0]['type'] != 'CNAME') || ($record[0]['target'] != $_POST['options']['bucket'].'s3.amazonaws.com')) {
!                       $error = "Warning: Your DNS doesn't seem to be setup correctly to virtually host the domain <em>".$_POST['options']['bucket']."</em>. ".
                                                "Double check and make sure the following entry is added to your DNS. ".
                                                "<a href='http://docs.amazonwebservices.com/AmazonS3/2006-03-01/VirtualHosting.html'>More info &gt;</a>".
                                                "<br /><br />".
***************
*** 107,112 ****
--- 124,130 ----
                          "<code>".$_POST['options']['bucket']." CNAME ".$_POST['options']['bucket'].".s3.amazonaws.com.</code>".
                                                "<br /><br />".
                                                "<small>You can ignore this message if you're sure everything is setup correctly.</small>";
+                     }
                  }
              }
          }
***************
*** 362,368 ****
          if (!$this->options['key'] || !$this->options['secret']) {
              return;
          }
-         $bucket = $this->options['bucket'];
          $accessDomain = $this->options['virtual-host'] ? $this->options['bucket'] : $this->options['bucket'].'.s3.amazonaws.com';
          
          $prefix = $_GET['prefix'] ? $_GET['prefix'] : '';
--- 380,385 ----
***************
*** 461,464 ****
          
      }
  }
! ?>
--- 478,481 ----
          
      }
  }
! ?>