diff --git a/S3fsStreamWrapper.inc b/S3fsStreamWrapper.inc index b6cd74e..a75c639 100644 --- a/S3fsStreamWrapper.inc +++ b/S3fsStreamWrapper.inc @@ -348,24 +348,26 @@ class S3fsStreamWrapper implements DrupalStreamWrapperInterface { return url(implode('/', $path_parts), array('absolute' => TRUE)); } } - + // Deal with public:// files. if (file_uri_scheme($this->uri) == 'public') { - if (substr($uri, -4) == '.css') { - // Send requests for public CSS files to /s3fs-css/path/to/file.css. - // Users must set that path up in the webserver config as a proxy into - // their S3 bucket's s3fs-public/ folder. - return "{$GLOBALS['base_url']}/s3fs-css/" . drupal_encode_path($uri); - } - else if (substr($uri, -3) == '.js') { - // Send requests for public JS files to /s3fs-js/path/to/file.js. - // Like with CSS, the user must set up that path as a proxy. - return "{$GLOBALS['base_url']}/s3fs-js/" . drupal_encode_path($uri); - } - else { - // public:// files are stored in S3 inside the s3fs-public/ folder. - $s3_key = "s3fs-public/$s3_key"; + // If the user has opted to rewrite the css/js files paths, then we need to rewrite them. + if ($this->config['rewrite_cssjs']) { + if (substr($uri, -4) == '.css') { + // Send requests for public CSS files to /s3fs-css/path/to/file.css. + // Users must set that path up in the webserver config as a proxy into + // their S3 bucket's s3fs-public/ folder. + return "{$GLOBALS['base_url']}/s3fs-css/" . drupal_encode_path($uri); + } + else if (substr($uri, -3) == '.js') { + // Send requests for public JS files to /s3fs-js/path/to/file.js. + // Like with CSS, the user must set up that path as a proxy. + return "{$GLOBALS['base_url']}/s3fs-js/" . drupal_encode_path($uri); + } } + + // public:// files are stored in S3 inside the s3fs-public/ folder. + $s3_key = "s3fs-public/$s3_key"; } // Set up the URL settings as speciied in our settings page. diff --git a/s3fs.admin.inc b/s3fs.admin.inc index 1c6d0d1..43b3be5 100644 --- a/s3fs.admin.inc +++ b/s3fs.admin.inc @@ -25,7 +25,7 @@ function s3fs_settings() { 'ap-northeast-1' => 'Asia Pacific - Tokyo (ap-northeast-1)', 'sa-east-1' => 'South America - Sao Paulo (sa-east-1)', ); - + $form['s3fs_credentials'] = array( '#type' => 'fieldset', '#title' => t('Amazon Web Services Credentials'), @@ -37,7 +37,7 @@ function s3fs_settings() { '#collapsible' => TRUE, '#collapsed' => !empty($config['awssdk2_access_key']) || !empty($config['use_instance_profile']), ); - + $form['s3fs_credentials']['s3fs_awssdk2_access_key'] = array( '#type' => 'textfield', '#title' => t('Amazon Web Services Access Key'), @@ -45,7 +45,7 @@ function s3fs_settings() { ); // Override with awssdk2_access_key from settings.php, if set. $form['s3fs_credentials']['s3fs_awssdk2_access_key']['#default_value'] = variable_get('awssdk2_access_key', $access_key); - + $form['s3fs_credentials']['s3fs_awssdk2_secret_key'] = array( '#type' => 'textfield', '#title' => t('Amazon Web Services Secret Key'), @@ -53,7 +53,7 @@ function s3fs_settings() { ); // Override with awssdk2_secret_key from settings.php, if set. $form['s3fs_credentials']['s3fs_awssdk2_secret_key']['#default_value'] = variable_get('awssdk2_secret_key', $secret_key); - + $form['s3fs_credentials']['s3fs_use_instance_profile'] = array( '#type' => 'checkbox', '#title' => t('Use EC2 Instance Profile Credentials'), @@ -76,7 +76,7 @@ function s3fs_settings() { ); // Override with awssdk2_default_cache_config from settings.php, if set. $form['s3fs_credentials']['s3fs_awssdk2_default_cache_config']['#default_value'] = variable_get('awssdk2_default_cache_config', $cache_config); - + $form['s3fs_bucket'] = array( '#type' => 'textfield', '#title' => t('S3 Bucket Name'), @@ -175,11 +175,21 @@ function s3fs_settings() { PLEASE NOTE: If you intend to use Drupal\'s performance options which aggregate your CSS or Javascript files, or will be using any other system that writes CSS or Javascript files into your site\'s public:// file system, you must perform some additional configuration on your webserver to make those - files work correctly when stored in S3. Please see the section titled "Aggregated CSS and JS in S3" in the + files work correctly when stored in S3 OR uncheck the \'Rewrite CSS/JS files\' options below.\'. + Please see the section titled "Aggregated CSS and JS in S3" in the !README for details.', array('!README' => l('README', drupal_get_path('module', 's3fs') . '/README.txt')) ), '#default_value' => !empty($config['use_s3_for_public']) ? $config['use_s3_for_public'] : FALSE, ); + $form['s3fs_rewrite_cssjs'] = array( + '#type' => 'checkbox', + '#title' => t('Rewrite CSS/JS files'), + '#description' => t( + 'If this box is checked, then S3FS will NOT rewrite that CSS/JS to the paths "/s3fs-(css|js)". Instead, they will + be placed on the page with their regular CDN name. + '), + '#default_value' => !empty($config['rewrite_cssjs']) ? $config['rewrite_cssjs'] : FALSE, + ); $form['s3fs_use_s3_for_private'] = array( '#type' => 'checkbox', '#title' => t('Use S3 for private:// files'), @@ -239,7 +249,7 @@ function s3fs_settings() { '#default_value' => !empty($config['torrents']) ? $config['torrents'] : '', '#rows' => 5, ); - + $form = system_settings_form($form); return $form; } @@ -273,11 +283,11 @@ function _s3fs_convert_form_state_to_config($form_state) { */ function s3fs_actions() { $form = array(); - + // Drupal's menu system doesn't let you set the page title for tabs. // So we set it here. drupal_set_title('S3 File System Actions'); - + $form['s3fs_refresh_cache'] = array( '#type' => 'fieldset', '#description' => t( @@ -306,11 +316,11 @@ function s3fs_actions() { ), '#submit' => array('_s3fs_refresh_cache_submit'), ); - + $config = _s3fs_get_config(); $use_public = !empty($config['use_s3_for_public']); $use_private = !empty($config['use_s3_for_private']); - + if ($use_public || $use_private) { $form['s3fs_copy_local'] = array( '#type' => 'fieldset', @@ -341,7 +351,7 @@ function s3fs_actions() { ); } } - + return $form; }