diff --git a/README.rst b/README.rst index c61a6a4..7fb43ff 100644 --- a/README.rst +++ b/README.rst @@ -172,14 +172,6 @@ fancyindex_exact_size accurately, or rounding off to the kilobyte, the megabyte and the gigabyte. -fancyindex_name_length -~~~~~~~~~~~~~~~~~~~~~~ -:Syntax: *fancyindex_name_length length* -:Default: fancyindex_name_length 50 -:Context: http, server, location -:Description: - Defines the maximum file name length limit in bytes. - fancyindex_footer ~~~~~~~~~~~~~~~~~ :Syntax: *fancyindex_footer path* [*subrequest* | *local*] diff --git a/ngx_http_fancyindex_module.c b/ngx_http_fancyindex_module.c index d5f1722..e6928dd 100644 --- a/ngx_http_fancyindex_module.c +++ b/ngx_http_fancyindex_module.c @@ -155,7 +155,6 @@ typedef struct { ngx_flag_t dirs_first; /**< Group directories together first when sorting */ ngx_flag_t localtime; /**< File mtime dates are sent in local time. */ ngx_flag_t exact_size; /**< Sizes are sent always in bytes. */ - ngx_uint_t name_length; /**< Maximum length of file names in bytes. */ ngx_flag_t hide_symlinks; /**< Hide symbolic links in listings. */ ngx_flag_t show_path; /**< Whether to display or not the path + '' after the header */ ngx_flag_t hide_parent; /**< Hide parent directory. */ @@ -413,13 +412,6 @@ static ngx_command_t ngx_http_fancyindex_commands[] = { offsetof(ngx_http_fancyindex_loc_conf_t, exact_size), NULL }, - { ngx_string("fancyindex_name_length"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, - ngx_conf_set_num_slot, - NGX_HTTP_LOC_CONF_OFFSET, - offsetof(ngx_http_fancyindex_loc_conf_t, name_length), - NULL }, - { ngx_string("fancyindex_header"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, ngx_fancyindex_conf_set_headerfooter, @@ -669,7 +661,7 @@ make_content_buf( const char *sort_url_args = ""; off_t length; - size_t len, root, copy, allocated, escape_html; + size_t len, root, allocated, escape_html; int64_t multiplier; u_char *filename, *last; ngx_tm_t tm; @@ -892,14 +884,13 @@ make_content_buf( * sizedate * */ - len += ngx_sizeof_ssz("") + entry[i].name.len + entry[i].utf_len + entry[i].escape_html - + alcf->name_length + ngx_sizeof_ssz(">") + ngx_sizeof_ssz("") + 20 /* File size */ + ngx_sizeof_ssz("") /* Date prefix */ @@ -1046,7 +1037,7 @@ make_content_buf( if (r->uri.len > 1 && alcf->hide_parent == 0) { b->last = ngx_cpymem_ssz(b->last, "" - "last = ngx_cpymem(b->last, sort_url_args, @@ -1062,7 +1053,7 @@ make_content_buf( /* Entries for directories and files */ for (i = 0; i < entries.nelts; i++) { - b->last = ngx_cpymem_ssz(b->last, "last = ngx_cpymem_ssz(b->last, "last, @@ -1092,40 +1083,15 @@ make_content_buf( len = entry[i].utf_len; - if (entry[i].name.len != len) { - if (len > alcf->name_length) { - copy = alcf->name_length - 3 + 1; - } else { - copy = alcf->name_length + 1; - } + b->last = (u_char *) ngx_escape_html(b->last, entry[i].name.data, entry[i].name.len); + last = b->last - 3; - last = b->last; - b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data, - copy, entry[i].name.len); - - b->last = (u_char *) ngx_escape_html(last, entry[i].name.data, b->last - last); - last = b->last; - - } else { - if (len > alcf->name_length) { - b->last = (u_char *) ngx_escape_html(b->last, entry[i].name.data, alcf->name_length + 1); - } else { - b->last = (u_char *) ngx_escape_html(b->last, entry[i].name.data, entry[i].name.len); - } - last = b->last - 3; + if (entry[i].dir) { + *b->last++ = '/'; + len++; } - if (len > alcf->name_length) { - b->last = ngx_cpymem_ssz(last, "..>"); - - } else { - if (entry[i].dir && alcf->name_length - len > 0) { - *b->last++ = '/'; - len++; - } - - b->last = ngx_cpymem_ssz(b->last, ""); - } + b->last = ngx_cpymem_ssz(b->last, ""); if (alcf->exact_size) { if (entry[i].dir) { @@ -1464,7 +1430,6 @@ ngx_http_fancyindex_create_loc_conf(ngx_conf_t *cf) conf->default_sort = NGX_CONF_UNSET_UINT; conf->dirs_first = NGX_CONF_UNSET; conf->localtime = NGX_CONF_UNSET; - conf->name_length = NGX_CONF_UNSET_UINT; conf->exact_size = NGX_CONF_UNSET; conf->ignore = NGX_CONF_UNSET_PTR; conf->hide_symlinks = NGX_CONF_UNSET; @@ -1491,7 +1456,6 @@ ngx_http_fancyindex_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->exact_size, prev->exact_size, 1); ngx_conf_merge_value(conf->show_path, prev->show_path, 1); ngx_conf_merge_value(conf->show_dot_files, prev->show_dot_files, 0); - ngx_conf_merge_uint_value(conf->name_length, prev->name_length, 50); ngx_conf_merge_str_value(conf->header.path, prev->header.path, ""); ngx_conf_merge_str_value(conf->header.path, prev->header.local, ""); diff --git a/template.h b/template.h index 2d6604b..02ba908 100644 --- a/template.h +++ b/template.h @@ -11,6 +11,9 @@ static const u_char t01_head1[] = "" "font-family:\"Bitstream Vera Sans\",\"Lucida Grande\"," "\"Lucida Sans Unicode\",Lucidux,Verdana,Lucida,sans-serif;" "}" +"table {" +"table-layout: fixed;" +"}" "tr:nth-child(even) {" "background:#f4f4f4;" "}" @@ -33,6 +36,11 @@ static const u_char t01_head1[] = "" "a:hover {" "color:#e33;" "}" +".link {" +"white-space: nowrap;" +"text-overflow: '>';" +"overflow: hidden;" +"}" "" "\n" ; @@ -57,9 +65,9 @@ static const u_char t06_list1[] = "" "" "" "" -"" -"" -"" +"" +"" +"" "" "" "\n" @@ -67,7 +75,7 @@ static const u_char t06_list1[] = "" ; static const u_char t_parentdir_entry[] = "" "" -"" +"" "" "" "" diff --git a/template.html b/template.html index b2a3174..b2f521b 100644 --- a/template.html +++ b/template.html @@ -10,6 +10,9 @@ font-family:"Bitstream Vera Sans","Lucida Grande", "Lucida Sans Unicode",Lucidux,Verdana,Lucida,sans-serif; } + table { + table-layout: fixed; + } tr:nth-child(even) { background:#f4f4f4; } @@ -32,6 +35,11 @@ a:hover { color:#e33; } + .link { + white-space: nowrap; + text-overflow: '>'; + overflow: hidden; + } @@ -55,33 +63,33 @@
File Name  ↓ File Size  ↓ Date  ↓ File Name  ↓ File Size  ↓ Date  ↓ 
Parent directory/Parent directory/--
- - - + + + - + - + - + - +
File Name  ↓ File Size  ↓ Date  ↓ File Name  ↓ File Size  ↓ Date  ↓ 
Parent directory/Parent directory/ - -
test file 1test file 1 123kB date
test file 2test file 2 321MB date
test file 3test file 3 666 date