From 844ecc37072d515513177c65a8c9dc35c9cdfc1a Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Mon, 19 Mar 2012 12:55:42 +0000 Subject: httrack 3.33.16 --- html/Makefile.am | 11 +- html/Makefile.in | 66 ++++++-- html/cache.html | 293 +++++++++++++++++++++++++++++++++ html/dev.html | 10 ++ html/httrack.man.html | 293 ++++++++++++++++++++++++++++----- html/images/bg_rings.gif | Bin 4243 -> 4235 bytes html/images/header_title_4.gif | Bin 2000 -> 1986 bytes html/img/addurl1.gif | Bin 9690 -> 9687 bytes html/img/addurl3.gif | Bin 10533 -> 10529 bytes html/img/addurl4.gif | Bin 9686 -> 9683 bytes html/img/addurl5.gif | Bin 9680 -> 9659 bytes html/img/backblue.gif | Bin 5616 -> 4721 bytes html/img/fade.gif | Bin 828 -> 53 bytes html/img/httrack.gif | Bin 4908 -> 4085 bytes html/img/snap1_b.gif | Bin 10569 -> 10567 bytes html/img/snap2_a.gif | Bin 49391 -> 49389 bytes html/img/snap2_b.gif | Bin 41329 -> 41328 bytes html/img/snap3_a.gif | Bin 40089 -> 6114 bytes html/img/snap4_a.gif | Bin 37990 -> 37989 bytes html/img/snap9.gif | Bin 4847 -> 4846 bytes html/img/snap9_a.gif | Bin 3450 -> 2559 bytes html/img/snap9_b.gif | Bin 4458 -> 4425 bytes html/img/snap9_c.gif | Bin 3445 -> 2555 bytes html/img/snap9_d.gif | Bin 6850 -> 5688 bytes html/img/snap9_d2.gif | Bin 9871 -> 8975 bytes html/img/snap9_d3.gif | Bin 8199 -> 7411 bytes html/img/snap9_d4.gif | Bin 8083 -> 7344 bytes html/img/snap9_d5.gif | Bin 10404 -> 9558 bytes html/img/snap9_d6.gif | Bin 9051 -> 7970 bytes html/img/snap9_d7.gif | Bin 9088 -> 8024 bytes html/img/snap9_e.gif | Bin 3491 -> 3458 bytes html/img/snap9_f.gif | Bin 3380 -> 3347 bytes html/img/snap9_g.gif | Bin 2888 -> 2024 bytes html/img/snap9_g2.gif | Bin 9388 -> 8457 bytes html/img/snap9_g3.gif | Bin 13593 -> 12992 bytes html/img/snap9_h.gif | Bin 2874 -> 2841 bytes html/img/snap9_i.gif | Bin 2459 -> 2427 bytes html/img/snap9_j.gif | Bin 4844 -> 3949 bytes html/img/snap9_k.gif | Bin 4935 -> 4901 bytes html/plug.html | 34 +++- html/server/about.html | 2 +- html/server/addurl.html | 2 +- html/server/error.html | 2 +- html/server/exit.html | 2 +- html/server/file.html | 2 +- html/server/finished.html | 5 +- html/server/help.html | 2 +- html/server/images/bg_rings.gif | Bin 4243 -> 4235 bytes html/server/images/fade.gif | Bin 828 -> 53 bytes html/server/images/header_title_4.gif | Bin 2000 -> 1986 bytes html/server/index.html | 2 +- html/server/option1.html | 2 +- html/server/option10.html | 2 +- html/server/option11.html | 2 +- html/server/option2.html | 2 +- html/server/option2b.html | 2 +- html/server/option3.html | 2 +- html/server/option4.html | 2 +- html/server/option5.html | 2 +- html/server/option6.html | 2 +- html/server/option7.html | 2 +- html/server/option8.html | 7 +- html/server/option9.html | 2 +- html/server/refresh.html | 6 +- html/server/sfx/finished.wav | Bin 0 -> 29840 bytes html/server/step2.html | 25 ++- html/server/step3.html | 2 +- html/server/step4.html | 20 ++- html/step3.html | 302 ++++++++++++++++++---------------- html/step9_opt2.html | 2 +- 70 files changed, 880 insertions(+), 232 deletions(-) create mode 100755 html/cache.html create mode 100755 html/server/sfx/finished.wav (limited to 'html') diff --git a/html/Makefile.am b/html/Makefile.am index 5bd12dd..a02e460 100755 --- a/html/Makefile.am +++ b/html/Makefile.am @@ -7,6 +7,7 @@ HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images HelpHtmlTxtdir = $(datadir)/doc/httrack/html WebHtmldir = $(datadir)/doc/httrack/html/server WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images +WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx WebPixmapdir = $(datadir)/pixmaps WebGPixmapdir = $(datadir)/httrack/icons VFolderEntrydir = $(prefix)/share/applications @@ -19,6 +20,7 @@ HelpHtmlimages_DATA = images/* HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt WebHtml_DATA = server/*.html WebHtmlimages_DATA = server/images/* +WebHtmlsfx_DATA = server/sfx/* # note: converted & normalized by # ico2xpm favicon.ico -o httrack.xpm # mogrify -format xpm -map /usr/share/doc/menu/examples/cmap.xpm httrack.xpm @@ -27,6 +29,13 @@ WebGPixmap_DATA = server/div/webhttrack.xpm VFolderEntry_DATA = server/div/*.desktop EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \ - $(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) \ + $(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) \ $(WebPixmap_DATA) $(WebGPixmap_DATA) $(VFolderEntry_DATA) \ httrack.css + +install-data-hook: + if test ! -f $(DESTDIR)$(prefix)/share/httrack/html ; then \ + ( cd $(DESTDIR)$(prefix)/share/httrack \ + && $(LN_S) ../doc/httrack/html html \ + ) \ + fi diff --git a/html/Makefile.in b/html/Makefile.in index 38f5149..90a625e 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -69,6 +69,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LFS_FLAG = @LFS_FLAG@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ @@ -141,6 +142,7 @@ HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images HelpHtmlTxtdir = $(datadir)/doc/httrack/html WebHtmldir = $(datadir)/doc/httrack/html/server WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images +WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx WebPixmapdir = $(datadir)/pixmaps WebGPixmapdir = $(datadir)/httrack/icons VFolderEntrydir = $(prefix)/share/applications @@ -153,6 +155,7 @@ HelpHtmlimages_DATA = images/* HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt WebHtml_DATA = server/*.html WebHtmlimages_DATA = server/images/* +WebHtmlsfx_DATA = server/sfx/* # note: converted & normalized by # ico2xpm favicon.ico -o httrack.xpm # mogrify -format xpm -map /usr/share/doc/menu/examples/cmap.xpm httrack.xpm @@ -161,7 +164,7 @@ WebGPixmap_DATA = server/div/webhttrack.xpm VFolderEntry_DATA = server/div/*.desktop EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \ - $(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) \ + $(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) \ $(WebPixmap_DATA) $(WebGPixmap_DATA) $(VFolderEntry_DATA) \ httrack.css @@ -173,7 +176,7 @@ DIST_SOURCES = DATA = $(HelpHtml_DATA) $(HelpHtmlTxt_DATA) $(HelpHtmldiv_DATA) \ $(HelpHtmlimages_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlroot_DATA) \ $(VFolderEntry_DATA) $(WebGPixmap_DATA) $(WebHtml_DATA) \ - $(WebHtmlimages_DATA) $(WebPixmap_DATA) + $(WebHtmlimages_DATA) $(WebHtmlsfx_DATA) $(WebPixmap_DATA) DIST_COMMON = Makefile.am Makefile.in all: all-am @@ -374,6 +377,24 @@ uninstall-WebHtmlimagesDATA: echo " rm -f $(DESTDIR)$(WebHtmlimagesdir)/$$f"; \ rm -f $(DESTDIR)$(WebHtmlimagesdir)/$$f; \ done +WebHtmlsfxDATA_INSTALL = $(INSTALL_DATA) +install-WebHtmlsfxDATA: $(WebHtmlsfx_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(WebHtmlsfxdir) + @list='$(WebHtmlsfx_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(WebHtmlsfxDATA_INSTALL) $$d$$p $(DESTDIR)$(WebHtmlsfxdir)/$$f"; \ + $(WebHtmlsfxDATA_INSTALL) $$d$$p $(DESTDIR)$(WebHtmlsfxdir)/$$f; \ + done + +uninstall-WebHtmlsfxDATA: + @$(NORMAL_UNINSTALL) + @list='$(WebHtmlsfx_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(WebHtmlsfxdir)/$$f"; \ + rm -f $(DESTDIR)$(WebHtmlsfxdir)/$$f; \ + done WebPixmapDATA_INSTALL = $(INSTALL_DATA) install-WebPixmapDATA: $(WebPixmap_DATA) @$(NORMAL_INSTALL) @@ -404,7 +425,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/div $(distdir)/images $(distdir)/img $(distdir)/server $(distdir)/server/div $(distdir)/server/images + $(mkinstalldirs) $(distdir)/div $(distdir)/images $(distdir)/img $(distdir)/server $(distdir)/server/div $(distdir)/server/images $(distdir)/server/sfx @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ case $$file in \ @@ -434,7 +455,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - $(mkinstalldirs) $(DESTDIR)$(HelpHtmldir) $(DESTDIR)$(HelpHtmlTxtdir) $(DESTDIR)$(HelpHtmldivdir) $(DESTDIR)$(HelpHtmlimagesdir) $(DESTDIR)$(HelpHtmlimgdir) $(DESTDIR)$(HelpHtmlrootdir) $(DESTDIR)$(VFolderEntrydir) $(DESTDIR)$(WebGPixmapdir) $(DESTDIR)$(WebHtmldir) $(DESTDIR)$(WebHtmlimagesdir) $(DESTDIR)$(WebPixmapdir) + $(mkinstalldirs) $(DESTDIR)$(HelpHtmldir) $(DESTDIR)$(HelpHtmlTxtdir) $(DESTDIR)$(HelpHtmldivdir) $(DESTDIR)$(HelpHtmlimagesdir) $(DESTDIR)$(HelpHtmlimgdir) $(DESTDIR)$(HelpHtmlrootdir) $(DESTDIR)$(VFolderEntrydir) $(DESTDIR)$(WebGPixmapdir) $(DESTDIR)$(WebHtmldir) $(DESTDIR)$(WebHtmlimagesdir) $(DESTDIR)$(WebHtmlsfxdir) $(DESTDIR)$(WebPixmapdir) install: install-am install-exec: install-exec-am @@ -481,7 +502,9 @@ install-data-am: install-HelpHtmlDATA install-HelpHtmlTxtDATA \ install-HelpHtmlimgDATA install-HelpHtmlrootDATA \ install-VFolderEntryDATA install-WebGPixmapDATA \ install-WebHtmlDATA install-WebHtmlimagesDATA \ - install-WebPixmapDATA + install-WebHtmlsfxDATA install-WebPixmapDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-exec-am: @@ -512,7 +535,8 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \ uninstall-HelpHtmlimgDATA uninstall-HelpHtmlrootDATA \ uninstall-VFolderEntryDATA uninstall-WebGPixmapDATA \ uninstall-WebHtmlDATA uninstall-WebHtmlimagesDATA \ - uninstall-WebPixmapDATA uninstall-info-am + uninstall-WebHtmlsfxDATA uninstall-WebPixmapDATA \ + uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ @@ -521,19 +545,27 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \ install-HelpHtmlimagesDATA install-HelpHtmlimgDATA \ install-HelpHtmlrootDATA install-VFolderEntryDATA \ install-WebGPixmapDATA install-WebHtmlDATA \ - install-WebHtmlimagesDATA install-WebPixmapDATA install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall \ - uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \ - uninstall-HelpHtmldivDATA uninstall-HelpHtmlimagesDATA \ - uninstall-HelpHtmlimgDATA uninstall-HelpHtmlrootDATA \ - uninstall-VFolderEntryDATA uninstall-WebGPixmapDATA \ - uninstall-WebHtmlDATA uninstall-WebHtmlimagesDATA \ + install-WebHtmlimagesDATA install-WebHtmlsfxDATA \ + install-WebPixmapDATA install-am install-data install-data-am \ + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-HelpHtmlDATA \ + uninstall-HelpHtmlTxtDATA uninstall-HelpHtmldivDATA \ + uninstall-HelpHtmlimagesDATA uninstall-HelpHtmlimgDATA \ + uninstall-HelpHtmlrootDATA uninstall-VFolderEntryDATA \ + uninstall-WebGPixmapDATA uninstall-WebHtmlDATA \ + uninstall-WebHtmlimagesDATA uninstall-WebHtmlsfxDATA \ uninstall-WebPixmapDATA uninstall-am uninstall-info-am + +install-data-hook: + if test ! -f $(DESTDIR)$(prefix)/share/httrack/html ; then \ + ( cd $(DESTDIR)$(prefix)/share/httrack \ + && $(LN_S) ../doc/httrack/html html \ + ) \ + fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/html/cache.html b/html/cache.html new file mode 100755 index 0000000..df28dc3 --- /dev/null +++ b/html/cache.html @@ -0,0 +1,293 @@ + + + + + + + HTTrack Website Copier - Cache format specification + + + + + + + + + +
HTTrack Website Copier
+ + + + +
Open Source offline browser
+ + + + +
+ + + + +
+ + + + +
+ + +

Cache format specification

+ +
+ +For updating purpose, HTTrack stores original (untouched) HTML data, +references to downloaded files, and other meta-data (especially parts of the HTTP headers) in a cache, +located in the hts-cache directory. Because local html pages are always modified to "fit" the local +filesystem structure, and because meta-data such as the last-Modified date and Etag can not be stored +with the associated files, the cache is absolutely mandatory for reprocessing (update/continue) phases. + +

+ +

The (new) cache.zip format

+ +The 3.31 release of HTTrack introduces a new cache format, more extensible and efficient than the previous one (ndx/dat format). + +The main advantages of this cache are: + +
    +
  • One single file for a complete website cache archive
    • +
  • Standard ZIP format, that can be easily reused on most platforms and languages
    • +
  • Compressed data with the efficient and opened zlib format
    • +
+ +The cache is made of ZIP files entries ; with one ZIP file entry per fetched URL (successfully or not - errors are also stored).
+For each entry: +
    +
  • The ZIP file name is the original URL [see notes below]
    • +
  • The ZIP file contents, if available, is the original (compressed, using the deflate algorythm) data
    • +
  • The ZIP file extra field (in the local file header) contains a list of meta-fields, very similar to the HTTP headers fields. See also RFC.

    • +
  • The ZIP file timestamp follows the "Last-Modified-Since" field given for this URL, if any
    • +
+ +Example of cache file: +
+ +
+$ unzip -l hts-cache/new.zip
+Archive:  hts-cache/new.zip
+HTTrack Website Copier/3.31-ALPHA-4 mirror complete in 3 seconds : 5 links scanned, 
+3 files written (16109 bytes overall) [17690 bytes received at 5896 bytes/sec]
+(1 errors, 0 warnings, 0 messages)
+  Length     Date   Time    Name
+ --------    ----   ----    ----
+       94  07-18-03 08:59   http://www.httrack.com/robots.txt
+     9866  01-17-04 01:09   http://www.httrack.com/html/cache.html
+        0  05-11-03 13:31   http://www.httrack.com/html/images/bg_rings.gif
+      207  01-19-04 05:49   http://www.httrack.com/html/fade.gif
+        0  05-11-03 13:31   http://www.httrack.com/html/images/header_title_4.gif
+ --------                   -------
+    10167                   5 files
+
+ +Example of cache file meta-data: +
+ +
+HTTP/1.1 200 OK
+X-In-Cache: 1
+X-StatusCode: 200
+X-StatusMessage: OK
+X-Size: 94
+Content-Type: text/plain
+Last-Modified: Fri, 18 Jul 2003 08:59:11 GMT
+Etag: "40ebb5-5e-3f17b6df"
+X-Addr: www.httrack.com
+X-Fil: /robots.txt
+
+ +There are also specific issues regarding this format: + +
    +
  • The data in the central directory (such as CD extra field, and CD comments) are not used
    • +
  • The ZIP archive is allowed to contains more than 2^16 files (65535) ; in such case the total number of entries in the 32-bit central directory is 65536 (0xffff), but the presence of the 64-bit central directory is not mandatory
    • +
  • The ZIP archive is allowed to contains more than 2^32 bytes (4GiB) ; in such case the 64-bit central directory must be present (not currently supported)
    • +
+ +
+Meta-data stored in the "extra field" of the local file headers
+ +The extra field is composed of text data, and this text data is composed of distinct lines of headers. +The end of text, or a double CR/LF, mark the end of this zone. +This method allows to optionally store original HTTP headers just after the "meta-data" headers for informational use.
+ +
+The status line (the first headers line)
+ +Status-Line = HTTP-Version SP Status-Code SP X-Reason-Phrase CRLF
+ +
+Other lines:
+ +
+Specific fields:
+
    +
  • X-In-Cache

    • +Indicates if the data are present (value=1) in the cache (that is, as ZIP data), or in an external file (value=0). +This field MUST be the first field. + +
  • X-StatusCode

    • +The modified (by httrack) status code after processing. 304 error codes ("Not modified"), for example, are transformed into "200" codes after processing. + +
  • X-StatusMessage

    • +The modified (by httrack) status message. + +
  • X-Size

    • +The stored (either in cache, or in an external file) data size. + +
  • X-Charset

    • +The original charset. + +
  • X-Addr

    • +The original URL address part. + +
  • X-Fil

    • +The original URL path part. + +
  • X-Save

    • +The local filename, depending on user's "build structure" preferences. + +
+ +
+Standard (RFC 2616) "useful" fields:
+
    +
  • Content-Type
    • +
  • Last-Modified
    • +
  • Etag
    • +
  • Location
    • +
  • Content-Disposition
    • +
+ +
+Specific fields in "BNF-like" grammar:
+ +
+X-In-Cache          = "X-In-Cache" ":" 1*DIGIT
+X-StatusCode        = "X-StatusCode" ":" 1*DIGIT
+X-StatusMessage     = "X-StatusMessage" ":" *<TEXT, excluding CR, LF>
+X-Size              = "X-Size" ":" 1*DIGIT
+X-Charset           = "X-Charset" ":" value
+X-Addr              = "X-Addr" ":" scheme ":" "//" authority
+X-Fil               = "X-Fil" ":" rel_path
+X-Save              = "X-Save" ":" rel_path
+
+ +RFC standard fields:
+ +
+Content-Type        = "Content-Type" ":" media-type
+Last-Modified       = "Last-Modified" ":" HTTP-date
+Etag                = "ETag" ":" entity-tag
+Location            = "Location" ":" absoluteURI
+Content-Disposition = "Content-Disposition" ":" disposition-type *( ";" disposition-parm )
+
+ +
+And, for your information, +
+X-Reason-Phrase     = *<TEXT, with a maximum of 32 characters, and excluding CR, LF>
+
+ + +Note: Because the URLs may have an unexpected format, especially with double "/" inside, and other reserved characters ("?", "&" ..), +various ZIP uncompressors can potentially have troubles accessing or decompressing the data. +Libraries should generally handle this peculiar format, however. + + +

+ + +
+
+
+ + + + + +
+ + + + + + diff --git a/html/dev.html b/html/dev.html index 9748991..66ae8a1 100644 --- a/html/dev.html +++ b/html/dev.html @@ -107,6 +107,8 @@ HTTrack can be used as a third-party program in batch files, or as library. Depending on your needs, you may look:

+ +

Programming

+ +

Technical references

+ +

diff --git a/html/httrack.man.html b/html/httrack.man.html index 986954b..33701d1 100644 --- a/html/httrack.man.html +++ b/html/httrack.man.html @@ -24,7 +24,7 @@
- +

NAME

--host-control[=N] ] [ -%P, --extended-parsing[=N] ] [ -n, --near ] [ -t, --test ] [ -%L, --list ] [ -%S, --urllist -] [ -NN, --structure[=N] ] [ -%M, ---mime-html[=N] ] [ -LN, --long-names[=N] ] [ --KN, --keep-links[=N] ] [ -x, ---replace-external ] [ -%x, --disable-passwords ] -[ -%q, --include-query-string ] [ -o, ---generate-errors ] [ -X, --purge-old[=N] ] [ --%p, --preserve ] [ -bN, --cookies[=N] ] [ --u, --check-type[=N] ] [ -j, --parse-java[=N] -] [ -sN, --robots[=N] ] [ -%h, --http-10 ] [ --%k, --keep-alive ] [ -%B, --tolerant ] [ --%s, --updatehack ] [ -%u, --urlhack ] [ --%A, --assume ] [ -@iN, --protocol[=N] ] [ --F, --user-agent ] [ -%F, --footer ] [ -%l, ---language ] [ -C, --cache[=N] ] [ -k, ---store-all-in-cache ] [ -%n, --do-not-recatch ] -[ -%v, --display ] [ -Q, --do-not-log ] [ --q, --quiet ] [ -z, --extra-log ] [ -Z, ---debug-log ] [ -v, --verbose ] [ -f, ---file-log ] [ -f2, --single-log ] [ -I, ---index ] [ -%i, --build-top-index ] [ -%I, ---search-index ] [ -pN, --priority[=N] ] [ -S, ---stay-on-same-dir ] [ -D, --can-go-down ] [ --U, --can-go-up ] [ -B, --can-go-up-and-down ] -[ -a, --stay-on-same-address ] [ -d, +] [ -NN, --structure[=N] ] [ -%M, --mime-html +] [ -LN, --long-names[=N] ] [ -KN, +--keep-links[=N] ] [ -x, --replace-external ] [ +-%x, --disable-passwords ] [ -%q, +--include-query-string ] [ -o, --generate-errors +] [ -X, --purge-old[=N] ] [ -%p, --preserve ] +[ -bN, --cookies[=N] ] [ -u, --check-type[=N] +] [ -j, --parse-java[=N] ] [ -sN, --robots[=N] +] [ -%h, --http-10 ] [ -%k, --keep-alive ] [ +-%B, --tolerant ] [ -%s, --updatehack ] [ +-%u, --urlhack ] [ -%A, --assume ] [ -@iN, +--protocol[=N] ] [ -F, --user-agent ] [ -%R, +--referer ] [ -%E, --from ] [ -%F, +--footer ] [ -%l, --language ] [ -C, +--cache[=N] ] [ -k, --store-all-in-cache ] [ +-%n, --do-not-recatch ] [ -%v, --display ] [ +-Q, --do-not-log ] [ -q, --quiet ] [ -z, +--extra-log ] [ -Z, --debug-log ] [ -v, +--verbose ] [ -f, --file-log ] [ -f2, +--single-log ] [ -I, --index ] [ -%i, +--build-top-index ] [ -%I, --search-index ] [ +-pN, --priority[=N] ] [ -S, --stay-on-same-dir +] [ -D, --can-go-down ] [ -U, --can-go-up ] [ +-B, --can-go-up-and-down ] [ -a, +--stay-on-same-address ] [ -d, --stay-on-same-domain ] [ -l, --stay-on-same-tld ] [ -e, --go-everywhere ] [ -%H, ---debug-headers ] [ -V, --userdef-cmd ] [ -%U, ---user ] [ -%W, --callback ] [ -K, +--debug-headers ] [ -%!, +--disable-security-limits ] [ -V, --userdef-cmd ] +[ -%U, --user ] [ -%W, --callback ] [ -K, --keep-links[=N] ] [

DESCRIPTION

@@ -120,7 +122,7 @@ site httrack www.someweb.com/bob/ www.anothertest.com/mike/ -+*.com/*.jpg ++*.com/*.jpg -mime:application/* @@ -628,6 +630,21 @@ structure type (0 *original structure, 1+: see below) user defined structure (-N "%h%p/%n%q.%t")
+ + +
+-%N
+ + + +
+delayed type check, don t make any link test but wait for +files download to start instead (experimental) (%N0 don t +use, %N1 use for unknown extensions, * %N2 always +use)
+ @@ -639,7 +656,7 @@ user defined structure (-N
generate a RFC MIME-encapsulated full-archive (.mht) -(--mime-html[=N])
+(--mime-html) @@ -804,7 +821,8 @@ check document type if unknown (cgi,asp..) (u0 don t check,
follow robots.txt and meta robots tags -(0=never,1=sometimes,* 2=always) (--robots[=N])
+(0=never,1=sometimes,* 2=always, 3=always (even strict +rules)) (--robots[=N]) @@ -887,6 +905,19 @@ assume that a type (cgi,asp..) is always linked with a mime type (-%A php3,cgi=text/html;dat,bin=application/x-zip) (--assume <param>)
+ + +
+-can
+ + + +
+also be used to force a specific file type: --assume +foo.cgi=text/html
+ @@ -916,8 +947,34 @@ only) (--protocol[=N])
cols="2" cellspacing="0" cellpadding="0"> -user-agent field (-F "user-agent name") -(--user-agent <param>) +user-agent field sent in HTTP headers (-F "user-agent +name") (--user-agent <param>) + + + +
+-%R
+ + + +
+default referer field sent in HTTP headers (--referer +<param>)
+ + + +
+-%E
+ + + +
+from email address sent in HTTP headers (--from +<param>)
@@ -1003,7 +1060,7 @@ do not re-download locally erased files
display on screen filenames downloaded (in realtime) - * %v1 -short version (--display)
+short version - %v2 full animation (--display) @@ -1350,6 +1407,30 @@ debug HTTP headers in logfile (--debug-headers)
filter test (-#0 *.gif www.bar.com/foo.gif ) (--debug-testfilters <param>) + + +
+-#1
+ + + +
+simplify test (-#1 ./foo/bar/../foobar)
+ + + +
+-#2
+ + + +
+type test (-#2 /foo/bar.php)
+ @@ -1363,6 +1444,42 @@ filter test (-#0 *.gif www.bar.com/foo.gif ) cache list (-#C *.com/spider*.gif (--debug-cache <param>)
+ + +
+-#R
+ + + +
+cache repair (damaged cache) (--debug-oldftp)
+ + + +
+-#d
+ + + +
+debug parser (--debug-parsing)
+ + + +
+-#E
+ + + +
+extract new.zip cache meta-data in meta.zip
+ @@ -1513,6 +1630,52 @@ generate transfer rate statictics every minutes execute a shell command (-#! "echo hello") (--exec <param>)
+ + +
+Dangerous options: (do NOT use unless you exactly know +what you are doing)
+ + + +
+-%!
+ + + +
+bypass built-in security limits aimed to avoid bandwith +abuses (bandwidth, simultaneous connections) +(--disable-security-limits)
+ + + +
+-IMPORTANT
+ + + +
+NOTE: DANGEROUS OPTION, ONLY SUITABLE FOR +EXPERTS
+ + + +
+-USE
+ + + +
+IT WITH EXTREME CARE
+ @@ -1557,7 +1720,7 @@ smith) (--user <param>)
use an external library function as a wrapper (-%W -link-detected=foo.so:myfunction) (--callback +link-detected=foo.so:myfunction[,myparameters]) (--callback <param>)
file, including file type (ex: image.gif) %t File type (ex: gif) %p Path [without ending /] (ex: /someimages) %h Host name (ex: www.someweb.com) %M URL MD5 (128 bits, 32 ascii -bytes) %Q query string MD5 (128 bits, 32 ascii bytes) %q -small query string MD5 (16 bits, 4 ascii bytes) %s? Short -name version (ex: %sN) %[param] param variable in query -string %[param:before:after:notfound:empty] advanced -variable extraction +bytes) %Q query string MD5 (128 bits, 32 ascii bytes) %r +protocol name (ex: http) %q small query string MD5 (16 bits, +4 ascii bytes) %s? Short name version (ex: %sN) %[param] +param variable in query string +%[param:before:after:notfound:empty] advanced variable +extraction @@ -2191,6 +2355,32 @@ opt);
change-options : int (* myfunction)(httrackp* opt); + + +
+preprocess-html : int (* myfunction)(char** html,int* +len,char* url
+ + + +
+adresse,char* url fichier);
+ + + +
+postprocess-html : int (* myfunction)(char** html,int* +len,char* url
+ + + +
+adresse,char* url fichier);
+ @@ -2266,6 +2456,19 @@ file);
link-detected : int (* myfunction)(char* link); + + +
+link-detected2 : int (* myfunction)(char* link, char* +start
+ + + +
+tag);
+ @@ -2291,6 +2494,18 @@ back* back);
complete,char* fil complete,char* referer adr,char* referer fil,char* save); + + + +
+And <wrappername>
+ + + +
+init() functions if defined, called upon plug

FILES

diff --git a/html/images/bg_rings.gif b/html/images/bg_rings.gif index da7c5c8..5dc34d1 100644 Binary files a/html/images/bg_rings.gif and b/html/images/bg_rings.gif differ diff --git a/html/images/header_title_4.gif b/html/images/header_title_4.gif index 93847d3..d5f203a 100644 Binary files a/html/images/header_title_4.gif and b/html/images/header_title_4.gif differ diff --git a/html/img/addurl1.gif b/html/img/addurl1.gif index 009277c..79ed0c6 100644 Binary files a/html/img/addurl1.gif and b/html/img/addurl1.gif differ diff --git a/html/img/addurl3.gif b/html/img/addurl3.gif index 6df70f8..30bfb0f 100644 Binary files a/html/img/addurl3.gif and b/html/img/addurl3.gif differ diff --git a/html/img/addurl4.gif b/html/img/addurl4.gif index 721e463..bec49b9 100644 Binary files a/html/img/addurl4.gif and b/html/img/addurl4.gif differ diff --git a/html/img/addurl5.gif b/html/img/addurl5.gif index 4f61bc4..678326e 100644 Binary files a/html/img/addurl5.gif and b/html/img/addurl5.gif differ diff --git a/html/img/backblue.gif b/html/img/backblue.gif index 99cbbaa..ddd15ff 100644 Binary files a/html/img/backblue.gif and b/html/img/backblue.gif differ diff --git a/html/img/fade.gif b/html/img/fade.gif index 579cc5f..0ae8336 100644 Binary files a/html/img/fade.gif and b/html/img/fade.gif differ diff --git a/html/img/httrack.gif b/html/img/httrack.gif index 51da0d2..82aca38 100644 Binary files a/html/img/httrack.gif and b/html/img/httrack.gif differ diff --git a/html/img/snap1_b.gif b/html/img/snap1_b.gif index 539e7c1..49853a0 100644 Binary files a/html/img/snap1_b.gif and b/html/img/snap1_b.gif differ diff --git a/html/img/snap2_a.gif b/html/img/snap2_a.gif index ddb0367..a840e1a 100644 Binary files a/html/img/snap2_a.gif and b/html/img/snap2_a.gif differ diff --git a/html/img/snap2_b.gif b/html/img/snap2_b.gif index 6d6ad07..a1d7000 100644 Binary files a/html/img/snap2_b.gif and b/html/img/snap2_b.gif differ diff --git a/html/img/snap3_a.gif b/html/img/snap3_a.gif index 84a32ef..7f720e1 100644 Binary files a/html/img/snap3_a.gif and b/html/img/snap3_a.gif differ diff --git a/html/img/snap4_a.gif b/html/img/snap4_a.gif index 18a8df9..f951626 100644 Binary files a/html/img/snap4_a.gif and b/html/img/snap4_a.gif differ diff --git a/html/img/snap9.gif b/html/img/snap9.gif index 1277e01..6c3c285 100644 Binary files a/html/img/snap9.gif and b/html/img/snap9.gif differ diff --git a/html/img/snap9_a.gif b/html/img/snap9_a.gif index 342f219..f45c1e2 100644 Binary files a/html/img/snap9_a.gif and b/html/img/snap9_a.gif differ diff --git a/html/img/snap9_b.gif b/html/img/snap9_b.gif index 07b9bd4..e450a5a 100644 Binary files a/html/img/snap9_b.gif and b/html/img/snap9_b.gif differ diff --git a/html/img/snap9_c.gif b/html/img/snap9_c.gif index 0620351..fe1b66e 100644 Binary files a/html/img/snap9_c.gif and b/html/img/snap9_c.gif differ diff --git a/html/img/snap9_d.gif b/html/img/snap9_d.gif index 120a26f..c46a6ec 100644 Binary files a/html/img/snap9_d.gif and b/html/img/snap9_d.gif differ diff --git a/html/img/snap9_d2.gif b/html/img/snap9_d2.gif index 4970603..1072cda 100644 Binary files a/html/img/snap9_d2.gif and b/html/img/snap9_d2.gif differ diff --git a/html/img/snap9_d3.gif b/html/img/snap9_d3.gif index c8f666d..740f9d6 100644 Binary files a/html/img/snap9_d3.gif and b/html/img/snap9_d3.gif differ diff --git a/html/img/snap9_d4.gif b/html/img/snap9_d4.gif index 82034eb..30e6923 100644 Binary files a/html/img/snap9_d4.gif and b/html/img/snap9_d4.gif differ diff --git a/html/img/snap9_d5.gif b/html/img/snap9_d5.gif index 5e4c4f8..4a36776 100644 Binary files a/html/img/snap9_d5.gif and b/html/img/snap9_d5.gif differ diff --git a/html/img/snap9_d6.gif b/html/img/snap9_d6.gif index e300bf3..192c83b 100644 Binary files a/html/img/snap9_d6.gif and b/html/img/snap9_d6.gif differ diff --git a/html/img/snap9_d7.gif b/html/img/snap9_d7.gif index 67d73bf..0e977f2 100644 Binary files a/html/img/snap9_d7.gif and b/html/img/snap9_d7.gif differ diff --git a/html/img/snap9_e.gif b/html/img/snap9_e.gif index 2ac97d1..e4d931f 100644 Binary files a/html/img/snap9_e.gif and b/html/img/snap9_e.gif differ diff --git a/html/img/snap9_f.gif b/html/img/snap9_f.gif index 58fced6..78922e3 100644 Binary files a/html/img/snap9_f.gif and b/html/img/snap9_f.gif differ diff --git a/html/img/snap9_g.gif b/html/img/snap9_g.gif index 4b26899..fcb3267 100644 Binary files a/html/img/snap9_g.gif and b/html/img/snap9_g.gif differ diff --git a/html/img/snap9_g2.gif b/html/img/snap9_g2.gif index 4dbd71a..f2219cc 100644 Binary files a/html/img/snap9_g2.gif and b/html/img/snap9_g2.gif differ diff --git a/html/img/snap9_g3.gif b/html/img/snap9_g3.gif index 318f016..d1f9933 100644 Binary files a/html/img/snap9_g3.gif and b/html/img/snap9_g3.gif differ diff --git a/html/img/snap9_h.gif b/html/img/snap9_h.gif index 8232bdc..7c8177a 100644 Binary files a/html/img/snap9_h.gif and b/html/img/snap9_h.gif differ diff --git a/html/img/snap9_i.gif b/html/img/snap9_i.gif index e671b61..801b84e 100644 Binary files a/html/img/snap9_i.gif and b/html/img/snap9_i.gif differ diff --git a/html/img/snap9_j.gif b/html/img/snap9_j.gif index c154dca..c6e8c22 100644 Binary files a/html/img/snap9_j.gif and b/html/img/snap9_j.gif differ diff --git a/html/img/snap9_k.gif b/html/img/snap9_k.gif index 8c5621e..2c21458 100644 Binary files a/html/img/snap9_k.gif and b/html/img/snap9_k.gif differ diff --git a/html/plug.html b/html/plug.html index ba4be25..4c99798 100755 --- a/html/plug.html +++ b/html/plug.html @@ -131,15 +131,16 @@ int process_file(char* html, int len, char* url_adresse, char* url_fichier) { Below the list of callbacks, and associated external wrappers:
- - + - - - + + + + + @@ -150,11 +151,34 @@ Below the list of callbacks, and associated external wrappers:
+ +
"callback name"callback descriptioncallback function signature
"callback name"callback descriptioncallback function signature
"init"Called during initialization
return value: none		void (* myfunction)(void);
"free"Called during un-initialization
return value: none		void (* myfunction)(void);
"start"Called when the mirror starts. The opt structure passed lists all options defined for this mirror. You may modify the opt structure to fit your needs
return value: 1 upon success, 0 upon error (the mirror will then be aborted)		int (* myfunction)(httrackp* opt);
"init"Note: deprecated, should not be used anymore (unsafe callback) - see "start" callback or wrapper_init() module function below this table.Called during initialization ; use of htswrap_add (see httrack-library.h) is permitted inside this function to setup other callbacks.
return value: none		void (* myfunction)(void);
"free"Note: deprecated, should not be used anymore (unsafe callback) - see "end" callback or wrapper_exit() module function below this table.
Called during un-initialization
return value: none		void (* myfunction)(void);
"start"Called when the mirror starts. The opt structure passed lists all options defined for this mirror. You may modify the opt structure to fit your needs. Besides, use of htswrap_add (see httrack-library.h) is permitted inside this function to setup other callbacks.
return value: 1 upon success, 0 upon error (the mirror will then be aborted)		int (* myfunction)(httrackp* opt);
"end"Called when the mirror ends
return value: 1 upon success, 0 upon error (the mirror will then be considered aborted)		int (* myfunction)(void);
"change-options"Called when options are to be changed. The opt structure passed lists all options, updated to take account of recent changes
return value: 1 upon success, 0 upon error (the mirror will then be aborted)		int (* myfunction)(httrackp* opt);
"check-html"Called when a document (which may not be an html document) is to be parsed. The html address points to the document data, of lenth len. The url_adresse and url_fichier are the address and URI of the file being processed
return value: 1 if the parsing can be processed, 0 if the file must be skipped without being parsed		int (* myfunction)(char* html,int len,char* url_adresse,char* url_fichier);
"preprocess-html"Called when a document (which is an html document) is to be parsed (original, not yet modified document). The html address points to the document data address (char**), and the length address points to the lenth of this document. Both pointer values (address and size) can be modified to change the document. It is up to the callback function to reallocate the given pointer (using standard C library realloc()/free() functions), which will be free()'ed by the engine. Hence, return of static buffers is strictly forbidden, and the use of strdup() in such cases is advised. The url_adresse and url_fichier are the address and URI of the file being processed
return value: 1 if the new pointers can be applied (default value)		int (* myfunction)(char** html,int* len,char* url_adresse,char* url_fichier);
"postprocess-html"Called when a document (which is an html document) is parsed and transformed (links rewritten). The html address points to the document data address (char**), and the length address points to the lenth of this document. Both pointer values (address and size) can be modified to change the document. It is up to the callback function to reallocate the given pointer (using standard C library realloc()/free() functions), which will be free()'ed by the engine. Hence, return of static buffers is strictly forbidden, and the use of strdup() in such cases is advised. The url_adresse and url_fichier are the address and URI of the file being processed
return value: 1 if the new pointers can be applied (default value)		int (* myfunction)(char** html,int* len,char* url_adresse,char* url_fichier);
"query"Called when the wizard needs to ask a question. The question string contains the question for the (human) user
return value: the string answer ("" for default reply)		char* (* myfunction)(char* question);
"query2"Called when the wizard needs to ask a questionchar* (* myfunction)(char* question);
"query3"Called when the wizard needs to ask a questionchar* (* myfunction)(char* question);
"link-detected"Called when a link has been detected
return value: 1 if the link can be analyzed, 0 if the link must not even be considered		int (* myfunction)(char* link);
"transfer-status"Called when a file has been processed (downloaded, updated, or error)
return value: must return 1		int (* myfunction)(lien_back* back);
"save-name"Called when a local filename has to be processed. The adr_complete and fil_complete are the address and URI of the file being saved ; the referer_adr and referer_fil are the address and URI of the referer link. The save string contains the local filename being used. You may modifiy the save string to fit your needs, up to 1024 bytes (note: filename collisions, if any, will be handled by the engine by renaming the file into file-2.ext, file-3.ext ..).
return value: must return 1		int (* myfunction)(char* adr_complete,char* fil_complete,char* referer_adr,char* referer_fil,char* save);
"send-header"Called when HTTP headers are to be sent to the remote server. The buff buffer contains text headers, adr and fil the URL, and referer_adr and referer_fil the referer URL. The outgoing structure contains all information related to the current slot.
return value: 1 if the mirror can continue, 0 if the mirror must be aborted		int (* myfunction)(char* buff, char* adr, char* fil, char* referer_adr, char* referer_fil, htsblk* outgoing);
"receive-header"Called when HTTP headers are recevived from the remote server. The buff buffer contains text headers, adr and fil the URL, and referer_adr and referer_fil the referer URL. The incoming structure contains all information related to the current slot.
return value: 1 if the mirror can continue, 0 if the mirror must be aborted		int (* myfunction)(char* buff, char* adr, char* fil, char* referer_adr, char* referer_fil, htsblk* incoming);


+Below additional function names that can be defined inside the module (DLL/.so):
+ + + + + + + +
"module function name"function description
int function-name_init(char *args);Called when a function named function-name is extracted from the current module (same as wrapper_init). The optional args provides additional commandline parameters. Returns 1 upon success, 0 if the function should not be extracted.
int wrapper_init(char *fname, char *args);Called when a function named fname is extracted from the current module. The optional args provides additional commandline parameters. Besides, use of htswrap_add (see httrack-library.h) is permitted inside this function to setup other callbacks. Returns 1 upon success, 0 if the function should not be extracted.
int wrapper_exit(void);Called when the module is unloaded. The function should return 1 (but the result is ignored).
+ +

+Below additional function names that can be defined inside the optional libhttrack-plugin module (libhttrack-plugin.dll or libhttrack-plugin.so) searched inside common library path:
+ + + + + + +
"module function name"function description
void plugin_init(void);Called if the module (named libhttrack-plugin.(so|dll)) is found in the library path. Use of htswrap_add (see httrack-library.h) is permitted inside this function to setup other callbacks.
+ +



diff --git a/html/server/about.html b/html/server/about.html index 4dc0ca8..087f68e 100755 --- a/html/server/about.html +++ b/html/server/about.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/addurl.html b/html/server/addurl.html index 932212b..ee1f5a7 100755 --- a/html/server/addurl.html +++ b/html/server/addurl.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/error.html b/html/server/error.html index 088f427..d8ea4d2 100755 --- a/html/server/error.html +++ b/html/server/error.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/exit.html b/html/server/exit.html index 21b7f9b..eafdf0d 100755 --- a/html/server/exit.html +++ b/html/server/exit.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/file.html b/html/server/file.html index 409e313..2dd3df6 100755 --- a/html/server/file.html +++ b/html/server/file.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/finished.html b/html/server/finished.html index c9d81c2..5777a27 100755 --- a/html/server/finished.html +++ b/html/server/finished.html @@ -1,4 +1,4 @@ - + @@ -135,6 +135,9 @@ ${do:end-if} + + +

${LANG_F18b}

diff --git a/html/server/help.html b/html/server/help.html index 9da3104..ef7f830 100755 --- a/html/server/help.html +++ b/html/server/help.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/images/bg_rings.gif b/html/server/images/bg_rings.gif index da7c5c8..5dc34d1 100755 Binary files a/html/server/images/bg_rings.gif and b/html/server/images/bg_rings.gif differ diff --git a/html/server/images/fade.gif b/html/server/images/fade.gif index 579cc5f..0ae8336 100755 Binary files a/html/server/images/fade.gif and b/html/server/images/fade.gif differ diff --git a/html/server/images/header_title_4.gif b/html/server/images/header_title_4.gif index 93847d3..d5f203a 100755 Binary files a/html/server/images/header_title_4.gif and b/html/server/images/header_title_4.gif differ diff --git a/html/server/index.html b/html/server/index.html index 05698f5..6d48219 100755 --- a/html/server/index.html +++ b/html/server/index.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option1.html b/html/server/option1.html index bc5c345..7e75e9e 100755 --- a/html/server/option1.html +++ b/html/server/option1.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option10.html b/html/server/option10.html index ce8c56c..0ebe51f 100755 --- a/html/server/option10.html +++ b/html/server/option10.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option11.html b/html/server/option11.html index b491e88..7aea791 100755 --- a/html/server/option11.html +++ b/html/server/option11.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option2.html b/html/server/option2.html index df57399..fd3ab8c 100755 --- a/html/server/option2.html +++ b/html/server/option2.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option2b.html b/html/server/option2b.html index 25abc7b..d227c30 100755 --- a/html/server/option2b.html +++ b/html/server/option2b.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option3.html b/html/server/option3.html index 43cb71e..743dc81 100755 --- a/html/server/option3.html +++ b/html/server/option3.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option4.html b/html/server/option4.html index 16c83b1..d686ec1 100755 --- a/html/server/option4.html +++ b/html/server/option4.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option5.html b/html/server/option5.html index 5c2f389..64ce3c5 100755 --- a/html/server/option5.html +++ b/html/server/option5.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option6.html b/html/server/option6.html index 1bad5f0..4e4a0ac 100755 --- a/html/server/option6.html +++ b/html/server/option6.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option7.html b/html/server/option7.html index fab427d..d689de2 100755 --- a/html/server/option7.html +++ b/html/server/option7.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/option8.html b/html/server/option8.html index 389311f..397e33c 100755 --- a/html/server/option8.html +++ b/html/server/option8.html @@ -1,4 +1,4 @@ - + @@ -202,6 +202,11 @@ ${listid:robots:LISTDEF_8} > ${LANG_I62b}

+ ${LANG_I62b2} +

+ ${LANG_I62} diff --git a/html/server/option9.html b/html/server/option9.html index 9a374b4..b77cccb 100755 --- a/html/server/option9.html +++ b/html/server/option9.html @@ -1,4 +1,4 @@ - + diff --git a/html/server/refresh.html b/html/server/refresh.html index e401445..35d3ecf 100755 --- a/html/server/refresh.html +++ b/html/server/refresh.html @@ -1,4 +1,4 @@ - + @@ -80,7 +80,7 @@ h4 { margin: 0; font-weight: bold; font-size: 1.18em; }