/[drupal]/contributions/modules/media_mover/contrib/mm_s3/mm_s3.module
ViewVC logotype

Diff of /contributions/modules/media_mover/contrib/mm_s3/mm_s3.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1.2.2.2.23, Sun Nov 1 15:44:29 2009 UTC revision 1.1.2.2.2.24, Sun Nov 1 15:47:02 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2    
3  // $Id: mm_s3.module,v 1.1.2.2.2.22 2009/11/01 15:38:38 arthuregg Exp $  // $Id: mm_s3.module,v 1.1.2.2.2.23 2009/11/01 15:44:29 arthuregg Exp $
4    
5  define('ACL_PRIVATE', 'private');  define('ACL_PRIVATE', 'private');
6  define('ACL_PUBLIC_READ', 'public-read');  define('ACL_PUBLIC_READ', 'public-read');
# Line 161  function _mm_s3_admin() { Line 161  function _mm_s3_admin() {
161      '#description' => t('Default permissions on files and buckets created on S3'),      '#description' => t('Default permissions on files and buckets created on S3'),
162    );    );
163    
164    $form['mm_s3']['mm_s3_server_url'] = array(    $form['mm_s3']['mm_s3_default_server_url'] = array(
165      '#type' => 'textfield',      '#type' => 'textfield',
166      '#title' => t('S3 URL'),      '#title' => t('S3 URL'),
167      '#default_value' => variable_get('mm_s3_server_url', "https://s3.amazonaws.com/"),      '#default_value' => variable_get('mm_s3_default_server_url', "https://s3.amazonaws.com/"),
168      '#description' => t('URL to send to amazon. You probably do not need to change this.'),      '#description' => t('URL to send to amazon. You probably do not need to change this.'),
169    );    );
170    
# Line 271  function mm_s3_config($action_id, $confi Line 271  function mm_s3_config($action_id, $confi
271    $form['mm_s3']['advanced']['mm_s3_server_url'] = array(    $form['mm_s3']['advanced']['mm_s3_server_url'] = array(
272      '#type' => 'textfield',      '#type' => 'textfield',
273      '#title' => t('Server URL'),      '#title' => t('Server URL'),
274      '#default_value' => $configuration['mm_s3_server_url'] ? $configuration['mm_s3_server_url'] : variable_get('mm_s3_server_url', 'https://s3.amazonaws.com/'),      '#default_value' => $configuration['mm_s3_server_url'] ? $configuration['mm_s3_server_url'] : variable_get('mm_s3_default_server_url', 'https://s3.amazonaws.com/'),
275      '#description' => t('Server URL. Use this to set the URL where your files will be served from. Normally this is s3.amazonaws.com, however you can define your own S3 URL with your DNS service.'),      '#description' => t('Server URL. Use this to set the URL where your files will be served from. Normally this is s3.amazonaws.com, however you can define your own S3 URL with your DNS service.'),
276    );    );
277    
Legend:
Removed from v.1.1.2.2.2.23  
changed lines
  Added in v.1.1.2.2.2.24
  ViewVC Help
Powered by ViewVC 1.1.2