@@ -44,6 +44,14 @@ function dav_admin_settings() { '#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')), '#description' => t('Whether to log debug/troubleshooting information on all DAV HTTP methods. Note that enabling this will have a negative impact on performance and you should never use this except for troubleshooting purposes. <em>Requires trace.module.</em>'), ); + $form['server']['dav_icons'] = array( + '#type' => 'radios', + '#title' => t('Enable web listing icons'), + '#default_value' => module_exists('file') ? (int)DAV_ICONS : FALSE, + '#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')), + '#description' => t('Whether to show MIME type icons next to files and directories when browsing the DAV listing in a web browser (i.e., using HTTP GET). <em>Requires FileFramework.</em>'), + '#attributes' => !module_exists('file') ? array('disabled' => 'disabled') : array(), + ); $form['server']['dav_encode'] = array( '#type' => 'textfield', '#title' => t('Characters to encode'), dav.admin.inc @@ -17,6 +17,7 @@ define('DAV_CLIENT', variable_get('dav_client', FALSE)); define('DAV_DOT_FILES', variable_get('dav_dot_files', TRUE)); define('DAV_TRACE', variable_get('dav_trace', FALSE)); define('DAV_ENCODE', variable_get('dav_encode', ' &<>|')); +define('DAV_ICONS', variable_get('dav_icons', module_exists('file'))); define('DAV_CRON', variable_get('dav_cron', TRUE)); define('DAV_WINDOWS_SERVER_DISCOVERY', variable_get('dav_windows_server_discovery', TRUE)); dav.module @@ -72,7 +72,33 @@ function theme_dav_resource($path, $name, $resource) { $mtime = format_date($mtime, 'small'); $slash = ($props['resourcetype'] == 'collection') ? '/' : ''; $name = check_plain($name); - $link = '<a href="./'. $name . $slash .'" class="dav '. $type .'">'. $name .'</a>'. $slash; + if (DAV_ICONS) { + if ($props['getcontenttype'] == 'httpd/unix-directory') { + $icon .= drupal_get_path('module', 'file_browser'); + $icon .= '/icons/folder.png"'; + } + else { + $type = $props['getcontenttype']; + /** + * Borrowed from FileFramework's file_mime_icon_for(). + */ + $handlers = file_get_mime_types(); + $default_mime_types = file_default_mime_types(); + $icon = is_array($handlers[$type]['icon']) ? reset($handlers[$type]['icon']) : $handlers[$type]['icon']; + $icon = isset($icon) ? $icon : (in_array(preg_replace('/([^\/]+).*/', '$1/*', $type), array_keys($default_mime_types)) ? $default_mime_types[preg_replace('/([^\/]+).*/', '$1/*', $type)]['icon'] : ''); + /** + * End borrowed code. + */ + $icon = drupal_get_path('module', 'file') .'/icons/'. $icon; + } + $image = '<img src="' . base_path() . $icon . '" '; + $image .= 'valign="middle" '; + $image .= 'alt="' . $type . '" '; + $image .= 'title="' . $type . '" '; + $image .= '/> '; + } + + $link = $image . '<a href="./'. $name . $slash .'" class="dav '. $type .'">'. $name .'</a>'. $slash; return sprintf(DAV_LS_FORMAT . "\n", $size, $mtime, $link); } dav.theme.inc 1b1f0bc782d896da66a8dde29d60f5b3b599793a Justin R. Miller incanus@codesorcery.net http://github.com/incanus/drupal-dav/commit/55a668516c0f72f002536f7e5475e0a8e4b58f37 55a668516c0f72f002536f7e5475e0a8e4b58f37 2008-11-07T19:03:26-08:00 2008-11-07T19:03:26-08:00 added MIME type icons to web listing (i.e., HTTP GET) of DAV resources 21fcb4c409f31442fa4134451e338427eb10464e Justin R. Miller incanus@codesorcery.net