? modules/simpletest/tests/file_url_test.info ? modules/simpletest/tests/file_url_test.module ? sites/default/files ? sites/default/settings.php Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.930 diff -u -p -r1.930 common.inc --- includes/common.inc 4 Jul 2009 18:26:42 -0000 1.930 +++ includes/common.inc 6 Jul 2009 14:12:18 -0000 @@ -2456,15 +2456,15 @@ function drupal_get_css($css = NULL) { // If a CSS file is not to be preprocessed and it's a module CSS file, it needs to *always* appear at the *top*, // regardless of whether preprocessing is on or off. if (!$preprocess && $type == 'module') { - $no_module_preprocess .= '' . "\n"; + $no_module_preprocess .= '' . "\n"; } // If a CSS file is not to be preprocessed and it's a theme CSS file, it needs to *always* appear at the *bottom*, // regardless of whether preprocessing is on or off. elseif (!$preprocess && $type == 'theme') { - $no_theme_preprocess .= '' . "\n"; + $no_theme_preprocess .= '' . "\n"; } else { - $output .= '' . "\n"; + $output .= '' . "\n"; } } } @@ -2476,7 +2476,7 @@ function drupal_get_css($css = NULL) { // starting with "ad*". $filename = 'css_' . md5(serialize($types) . $query_string) . '.css'; $preprocess_file = drupal_build_css_cache($types, $filename); - $output .= '' . "\n"; + $output .= '' . "\n"; } } if (!empty($no_inline_preprocess)) { @@ -2918,7 +2918,7 @@ function drupal_get_js($scope = 'header' case 'file': if (!$item['preprocess'] || !$is_writable || !$preprocess_js) { - $no_preprocess .= '\n"; + $no_preprocess .= '\n"; } else { $files[$item['data']] = $item; @@ -2938,7 +2938,7 @@ function drupal_get_js($scope = 'header' // starting with "ad*". $filename = 'js_' . md5(serialize($files) . $query_string) . '.js'; $preprocess_file = drupal_build_js_cache($files, $filename); - $preprocessed .= '' . "\n"; + $preprocessed .= '' . "\n"; } // Keep the order of JS files consistent as some are preprocessed and others are not. Index: includes/file.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/file.inc,v retrieving revision 1.171 diff -u -p -r1.171 file.inc --- includes/file.inc 9 Jun 2009 21:33:12 -0000 1.171 +++ includes/file.inc 6 Jul 2009 14:12:18 -0000 @@ -79,20 +79,60 @@ define('FILE_STATUS_PERMANENT', 1); /** * Create the download path to a file. * - * @param $path A string containing the path of the file to generate URL for. - * @return A string containing a URL that can be used to download the file. + * There are two kinds of files: + * - "created files", i.e. those in the files directory (which is stored in + * the file_directory_path variable and can be retrieved using + * file_directory_path()). These are files that have either been uploaded by + * users or were generated automatically (for example through CSS + * aggregation). + * - "shipped files", i.e. those outside of the files directory, which ship as + * part of Drupal core or contributed modules or themes. + * When a hook_url_alter() function is defined and overrides the path, + * then that rewritten path is used instead of creating a URL for the file at + * the given path. + * + * @param $path + * A string containing the Drupal path (i.e. path relative to the Drupal + * root directory) of the file to generate the URL for. + * @return + * A string containing a URL that can be used to download the file. */ function file_create_url($path) { - // Strip file_directory_path from $path. We only include relative paths in - // URLs. - if (strpos($path, file_directory_path() . '/') === 0) { - $path = trim(substr($path, strlen(file_directory_path())), '\\/'); - } - switch (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC)) { - case FILE_DOWNLOADS_PUBLIC: - return $GLOBALS['base_url'] . '/' . file_directory_path() . '/' . str_replace('\\', '/', $path); - case FILE_DOWNLOADS_PRIVATE: - return url('system/files/' . $path, array('absolute' => TRUE)); + // Clean up Windows paths. + $oldpath = $path = str_replace('\\', '/', $path); + + drupal_alter('url', $path); + + // If any module has altered the path, then return the alteration. + if ($path != $oldpath) { + return $path; + } + + // Otherwise serve the file from Drupal's web server. This point will only + // be reached when either no custom_file_url_rewrite() function has been + // defined, or when that function returned FALSE, thereby indicating that it + // cannot (or doesn't wish to) rewrite the URL. This is typically because + // the file doesn't match some conditions to be served from a CDN or static + // file server, or because the file has not yet been synced to the CDN or + // static file server. + + // Shipped files. + if (strpos($path, file_directory_path() . '/') !== 0) { + return base_path() . $path; + } + // Created files. + else { + switch (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC)) { + case FILE_DOWNLOADS_PUBLIC: + return $GLOBALS['base_url'] . '/' . $path; + case FILE_DOWNLOADS_PRIVATE: + // Strip file_directory_path from $path. Private downloads' URLs are + // rewritten to be served relatively to system/files (which is a menu + // callback that streams the file) instead of relatively to the file + // directory path. + $path = trim(substr($path, strlen(file_directory_path())), '/'); + return url('system/files/' . $path, array('absolute' => TRUE)); + } } } Index: includes/form.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/form.inc,v retrieving revision 1.347 diff -u -p -r1.347 form.inc --- includes/form.inc 5 Jul 2009 18:02:08 -0000 1.347 +++ includes/form.inc 6 Jul 2009 14:12:18 -0000 @@ -2413,7 +2413,7 @@ function theme_image_button($element) { (!empty($element['#value']) ? ('value="' . check_plain($element['#value']) . '" ') : '') . 'id="' . $element['#id'] . '" ' . drupal_attributes($element['#attributes']) . - ' src="' . base_path() . $element['#src'] . '" ' . + ' src="' . file_create_url($element['#src']) . '" ' . (!empty($element['#title']) ? 'alt="' . check_plain($element['#title']) . '" title="' . check_plain($element['#title']) . '" ' : '' ) . "/>\n"; } Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.497 diff -u -p -r1.497 theme.inc --- includes/theme.inc 2 Jul 2009 04:27:22 -0000 1.497 +++ includes/theme.inc 6 Jul 2009 14:12:19 -0000 @@ -1097,24 +1097,24 @@ function theme_get_setting($setting_name if ($settings['toggle_logo']) { if ($settings['default_logo']) { - $settings['logo'] = base_path() . dirname($theme_object->filename) . '/logo.png'; + $settings['logo'] = file_create_url(dirname($theme_object->filename) . '/logo.png'); } elseif ($settings['logo_path']) { - $settings['logo'] = base_path() . $settings['logo_path']; + $settings['logo'] = file_create_url($settings['logo_path']); } } if ($settings['toggle_favicon']) { if ($settings['default_favicon']) { if (file_exists($favicon = dirname($theme_object->filename) . '/favicon.ico')) { - $settings['favicon'] = base_path() . $favicon; + $settings['favicon'] = file_create_url($favicon); } else { - $settings['favicon'] = base_path() . 'misc/favicon.ico'; + $settings['favicon'] = file_create_url('misc/favicon.ico'); } } elseif ($settings['favicon_path']) { - $settings['favicon'] = base_path() . $settings['favicon_path']; + $settings['favicon'] = file_create_url($settings['favicon_path']); } else { $settings['toggle_favicon'] = FALSE; @@ -1338,7 +1338,7 @@ function theme_links($links, $attributes function theme_image($path, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) { if (!$getsize || (is_file($path) && (list($width, $height, $type, $image_attributes) = @getimagesize($path)))) { $attributes = drupal_attributes($attributes); - $url = (url($path) == $path) ? $path : (base_path() . $path); + $url = file_create_url($path); return '' . check_plain($alt) . ''; } } Index: modules/simpletest/tests/file.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file.test,v retrieving revision 1.32 diff -u -p -r1.32 file.test --- modules/simpletest/tests/file.test 2 Jun 2009 13:42:40 -0000 1.32 +++ modules/simpletest/tests/file.test 6 Jul 2009 14:12:19 -0000 @@ -1908,6 +1908,25 @@ class FileDownloadTest extends FileTestC } /** + * Test the generating of public file URLs. + */ + function testPublicFileURL() { + // Set file downloads to public. + variable_set('file_downloads', FILE_DOWNLOADS_PUBLIC); + + // Test generating an URL to a created file. + $file = $this->createFile(); + $url = file_create_url($file->filepath); + $this->assertEqual($GLOBALS['base_url'] . '/' . file_directory_path() . '/' . $file->filename, $url, t('Correctly generated a URL for a created file.')); + + // Test generating an URL to a shipped file (i.e. a file that is part of + // Drupal core, a module or a theme, for example a JavaScript file). + $file = 'misc/jquery.js'; + $url = file_create_url($file); + $this->assertEqual(base_path() . $file, $url, t('Correctly generated a URL for a shipped file.')); + } + + /** * Test the private file transfer system. */ function testPrivateFileTransfer() { @@ -1916,7 +1935,7 @@ class FileDownloadTest extends FileTestC // Create a file. $file = $this->createFile(); - $url = file_create_url($file->filename); + $url = file_create_url($file->filepath); // Set file_test access header to allow the download. file_test_set_return('download', array('x-foo' => 'Bar')); @@ -1938,6 +1957,45 @@ class FileDownloadTest extends FileTestC } /** + * Tests for file URL rewriting. + */ +class FileURLRewritingTest extends FileDownloadTest { + public static function getInfo() { + return array( + 'name' => t('File URL rewriting'), + 'description' => t('Tests for file URL rewriting.'), + 'group' => t('File'), + ); + } + + function setUp() { + DrupalWebTestCase::setUp('file_test', 'file_url_test'); + } + + /** + * Test the generating of rewritten public file URLs. + */ + function testPublicFileURL() { + // Set file downloads to public. + variable_set('file_downloads', FILE_DOWNLOADS_PUBLIC); + + // Test generating an URL to a created file. + $file = $this->createFile(); + $url = file_create_url($file->filepath); + $this->assertEqual(FILE_URL_TEST_CDN_1 . '/' . $file->filepath, $url, t('Correctly generated a URL for a created file.')); + + // Test generating an URL to a shipped file (i.e. a file that is part of + // Drupal core, a module or a theme, for example a JavaScript file). + $file = 'misc/jquery.js'; + $url = file_create_url($file); + $this->assertEqual(FILE_URL_TEST_CDN_1 . '/' . $file, $url, t('Correctly generated a URL for a shipped file.')); + $file = 'misc/favicon.ico'; + $url = file_create_url($file); + $this->assertEqual(FILE_URL_TEST_CDN_2 . '/' . $file, $url, t('Correctly generated a URL for a shipped file.')); + } +} + +/** * Tests for file_munge_filename() and file_unmunge_filename(). */ class FileNameMungingTest extends FileTestCase { Index: modules/system/system.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v retrieving revision 1.47 diff -u -p -r1.47 system.api.php --- modules/system/system.api.php 5 Jul 2009 18:00:10 -0000 1.47 +++ modules/system/system.api.php 6 Jul 2009 14:12:19 -0000 @@ -621,7 +621,7 @@ function hook_profile_alter(&$account) { * either a custom address or the site-wide default email address. * - 'headers' * Associative array containing mail headers, such as From, Sender, - * MIME-Version, Content-Type, etc. + * MIME-Version, Content-Type, etc. */ function hook_mail_alter(&$message) { if ($message['mail_id'] == 'my_message') { @@ -977,7 +977,7 @@ function hook_watchdog(array $log_entry) * array when the hook is invoked. * - 'from': * The address the message will be marked as being from, which is - * set by drupal_mail() to either a custom address or the site-wide + * set by drupal_mail() to either a custom address or the site-wide * default email address when the hook is invoked. * - 'headers': * Associative array containing mail headers, such as From, Sender, @@ -1184,6 +1184,46 @@ function custom_url_rewrite_inbound(&$re } /** + * Alter the URL to a file or Drupal path. + * + * This hook is called from file_create_url(), and is called fairly frequently + * (10+ times per page), depending on how many files there are in a given page. + * If CSS and JS aggregation are disabled, this can become very frequently (50+ + * times per page) so performance is critical. + * + * This function should return the rewritten path, if it wants to rewrite the + * file URL. If it doesn't want to rewrite a given path, then it should + * return FALSE. + * + * @param $path + * A string containing the Drupal path (i.e. path relative to the Drupal + * root directory) of the file to generate the URL for. + * @return + * A string containing a URL that can be used to download the file. + */ +function hook_url_alter(&$path) { + $cdn1 = 'http://cdn1.example.com'; + $cdn2 = 'http://cdn2.example.com'; + $cdn_extensions = array('css', 'js', 'gif', 'jpg', 'jpeg', 'png'); + + // Most CDN's don't support private file transfers without a lot of hassle, + // so don't support this in the common case. + if (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PRIVATE) { + return FALSE; + } + + // Serve files without extension and files with one of the CDN extensions + // from CDN 1, all others from CDN 2. + $pathinfo = pathinfo($path); + if (!array_key_exists('extension', $pathinfo) || in_array($pathinfo['extension'], $cdn_extensions)) { + $path = $cdn1 . '/' . $path; + } + else { + $path = $cdn2 . '/' . $path; + } +} + +/** * Load additional information into file objects. * * file_load_multiple() calls this hook to allow modules to load Index: themes/garland/template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/template.php,v retrieving revision 1.22 diff -u -p -r1.22 template.php --- themes/garland/template.php 2 Jun 2009 03:57:22 -0000 1.22 +++ themes/garland/template.php 6 Jul 2009 14:12:19 -0000 @@ -91,9 +91,9 @@ function garland_node_submitted($node) { function garland_get_ie_styles() { global $language; - $ie_styles = '' . "\n"; + $ie_styles = '' . "\n"; if ($language->direction == LANGUAGE_RTL) { - $ie_styles .= ' ' . "\n"; + $ie_styles .= ' ' . "\n"; } return $ie_styles;