1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
Index: webmagick.in
===================================================================
RCS file: /cvsroot/webmagick/WebMagick/webmagick.in,v
retrieving revision 1.117
retrieving revision 1.119
diff -u -r1.117 -r1.119
--- webmagick.in 23 Oct 2002 16:14:47 -0000 1.117
+++ webmagick.in 30 Jan 2003 04:19:33 -0000 1.119
@@ -1,6 +1,6 @@
#! @PERL@
#
-# $Id: webmagick.in,v 1.117 2002/10/23 16:14:47 clindell Exp $
+# $Id: webmagick.in,v 1.119 2003/01/30 04:19:33 ache Exp $
#
# You are looking at the main PERL script for WebMagick, a package to
# intelligently create HTML and JavaScript index files and imagemaps
@@ -2173,17 +2173,14 @@
print( INDEX $framespechtml );
print( INDEX "<NOFRAMES>\n" );
print( INDEX "<BODY\n" );
- unless ("$opt_stylesheet" ne '')
- {
- print( INDEX " TEXT=\"${opt_colorfore}\"\n" );
- print( INDEX " BGCOLOR=\"${opt_colorback}\"\n" )
- if $opt_colorback ne 'false';
- print( INDEX " BACKGROUND=\"$iconImageUrls{background}\"\n" )
- if defined $iconImageUrls{background};
- print( INDEX " LINK=\"${opt_colorlink}\"\n" );
- print( INDEX " VLINK=\"${opt_colorvlink}\"\n" );
- print( INDEX " ALINK=\"${opt_coloralink}\"");
- }
+ print( INDEX " TEXT=\"${opt_colorfore}\"\n" );
+ print( INDEX " BGCOLOR=\"${opt_colorback}\"\n" )
+ if $opt_colorback ne 'false';
+ print( INDEX " BACKGROUND=\"$iconImageUrls{background}\"\n" )
+ if defined $iconImageUrls{background};
+ print( INDEX " LINK=\"${opt_colorlink}\"\n" );
+ print( INDEX " VLINK=\"${opt_colorvlink}\"\n" );
+ print( INDEX " ALINK=\"${opt_coloralink}\"");
print( INDEX ">\n" );
print( INDEX $indexhtml );
print( INDEX "</BODY>\n</NOFRAMES>\n</HTML>" );
@@ -2242,17 +2239,14 @@
print( INDEX "</HEAD>\n" );
print( INDEX "<BODY\n" );
- unless ("$opt_stylesheet" ne '')
- {
- print( INDEX " TEXT=\"${opt_dircolorfore}\"\n" );
- print( INDEX " BGCOLOR=\"${opt_dircolorback}\"\n" )
- if $opt_dircolorback ne 'false';
- print( INDEX " BACKGROUND=\"$iconImageUrls{dirbackground}\"\n" )
- if defined $iconImageUrls{dirbackground};
- print( INDEX " LINK=\"${opt_dircolorlink}\"\n" );
- print( INDEX " VLINK=\"${opt_dircolorvlink}\"\n" );
- print( INDEX " ALINK=\"${opt_dircoloralink}\"" );
- }
+ print( INDEX " TEXT=\"${opt_dircolorfore}\"\n" );
+ print( INDEX " BGCOLOR=\"${opt_dircolorback}\"\n" )
+ if $opt_dircolorback ne 'false';
+ print( INDEX " BACKGROUND=\"$iconImageUrls{dirbackground}\"\n" )
+ if defined $iconImageUrls{dirbackground};
+ print( INDEX " LINK=\"${opt_dircolorlink}\"\n" );
+ print( INDEX " VLINK=\"${opt_dircolorvlink}\"\n" );
+ print( INDEX " ALINK=\"${opt_dircoloralink}\"" );
print( INDEX ">\n");
print( INDEX $pagedirhtml );
print( INDEX "</BODY></HTML>\n" );
@@ -2379,16 +2373,13 @@
print( INDEX "</HEAD>\n" );
print( INDEX "<BODY\n" );
- unless ("$opt_stylesheet" ne '')
- {
- print( INDEX " TEXT=\"${opt_colorfore}\"\n" );
- print( INDEX " BGCOLOR=\"${opt_colorback}\"\n" );
- print( INDEX " BACKGROUND=\"$iconImageUrls{background}\"\n" )
- if defined $iconImageUrls{background};
- print( INDEX " LINK=\"${opt_colorlink}\"\n" );
- print( INDEX " VLINK=\"${opt_colorvlink}\"\n" );
- print( INDEX " ALINK=\"${opt_coloralink}\"" );
- }
+ print( INDEX " TEXT=\"${opt_colorfore}\"\n" );
+ print( INDEX " BGCOLOR=\"${opt_colorback}\"\n" );
+ print( INDEX " BACKGROUND=\"$iconImageUrls{background}\"\n" )
+ if defined $iconImageUrls{background};
+ print( INDEX " LINK=\"${opt_colorlink}\"\n" );
+ print( INDEX " VLINK=\"${opt_colorvlink}\"\n" );
+ print( INDEX " ALINK=\"${opt_coloralink}\"" );
print( INDEX ">\n");
print( INDEX "${opt_header}\n" ) if ("$opt_header" ne '');
@@ -2433,7 +2424,9 @@
my $pic = $imageNames[$pageNumber - 1][$imageNum];
my $pichtml;
+ my $altlabel;
my $target = '';
+
if ($opt_pichtml && $opt_frames && "$opt_pichtmltarget" ne '') {
$target = " TARGET=\"${opt_pichtmltarget}\"";
}
@@ -2441,6 +2434,12 @@
if ( $opt_pichtml ) {
$pichtml = $pic . $opt_pichtmlext;
+ if (defined($imageLabels{$pic})) {
+ $altlabel = $imageLabels{$pic};
+ } else {
+ ($altlabel = $pic) =~ s/(.*)\.\w+$/$1/i;
+ $altlabel =~ y/_/ /; # Usual space replacement in file name
+ }
open( PICHTML, ">$pichtml")
|| die("$0: Failed to open file $pichtml for output\n$@\n");
@@ -2448,7 +2447,7 @@
# Charset is better before title
print( PICHTML " <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=${opt_metacharset}\">\n" )
if( "$opt_metacharset" ne '' );
- print( PICHTML " <TITLE>$pic</TITLE>\n" );
+ print( PICHTML " <TITLE>", escapehtml($altlabel), "</TITLE>\n" );
# Meta tags
print( PICHTML " <META NAME=\"GENERATOR\" CONTENT=\"WebMagick/$webmagickInfo{version} [WebMagick]\">\n" );
@@ -2469,27 +2468,20 @@
print( PICHTML "</HEAD>\n" );
print( PICHTML "<BODY\n" );
- unless ("$opt_stylesheet" ne '')
- {
- print( PICHTML " TEXT=\"${opt_colorfore}\"\n" );
- print( PICHTML " BGCOLOR=\"${opt_colorback}\"\n" );
- print( PICHTML " BACKGROUND=\"$iconImageUrls{background}\"\n" )
- if defined $iconImageUrls{background};
- print( PICHTML " LINK=\"${opt_colorlink}\"\n" );
- print( PICHTML " VLINK=\"${opt_colorvlink}\"\n" );
- print( PICHTML " ALINK=\"${opt_coloralink}\"");
- }
+ print( PICHTML " TEXT=\"${opt_colorfore}\"\n" );
+ print( PICHTML " BGCOLOR=\"${opt_colorback}\"\n" );
+ print( PICHTML " BACKGROUND=\"$iconImageUrls{background}\"\n" )
+ if defined $iconImageUrls{background};
+ print( PICHTML " LINK=\"${opt_colorlink}\"\n" );
+ print( PICHTML " VLINK=\"${opt_colorvlink}\"\n" );
+ print( PICHTML " ALINK=\"${opt_coloralink}\"");
print( PICHTML ">\n" );
print( PICHTML "$opt_pichtmltop") if ("$opt_pichtmltop" ne '');
if ($opt_pichtmlputtitle) {
print ( PICHTML "${opt_pichtmltitlestart}");
- if (defined( $imageLabels{$pic})) {
- print( PICHTML "$imageLabels{$pic}");
- } else {
- print( PICHTML "$pic");
- }
+ print ( PICHTML escapehtml($altlabel));
print ( PICHTML "${opt_pichtmltitleend}");
}
@@ -2556,10 +2548,10 @@
print ( PICHTML "</NOBR><BR>");
}
- if ( $pic =~ /\.(jpg|jpeg?|gif|xbm|png)$/i ) {
- print( PICHTML "<IMG SRC=\"$pic\" ALT=\"\">" );
+ if ($pic =~ /\.(jpg|jpeg?|gif|xbm|png)$/i) {
+ print( PICHTML "<IMG SRC=\"", escapeurl($pic), "\" ALT=\"", escapehtml($altlabel), "\">" );
} else {
- print( PICHTML "<A HREF=\"", escapeurl($pic), "\"><BIG><B>$pic</B></A> ", fsize($pic), "</BIG>" );
+ print( PICHTML "<A HREF=\"", escapeurl($pic), "\"><BIG><B>", escapehtml($pic), "</B></A> ", fsize($pic), "</BIG>" );
}
print( PICHTML "$opt_pichtmlbottom\n") if ("$opt_pichtmlbottom" ne '');
@@ -4296,6 +4288,7 @@
s/&/&/g;
s/>/>/g;
s/</</g;
+ s/\"/"/g; # because we use "xxx" form sometimes
return( $_ );
}
|
