← Back to branch summary

~ubuntu-branches/ubuntu/feisty/awstats/feisty

« back to all changes in this revision

Viewing changes to debian/patches/03_remove_eval.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jonas Smedegaard, Charles Fry, Jonas Smedegaard
  • Date: 2005-09-19 22:41:16 UTC
  • mfrom: (1.2.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050919224116-6bo795sxx5nsosby
Tags: 6.4-2
http://bugs.debian.org/316126
http://bugs.debian.org/313093
http://bugs.debian.org/322591
[ Charles Fry ]
* New co-maintainer.
* Suggest libgeo-ipfree-perl. Closes: #316126 (thanks to Gunnar Wolf
  <gwolf@gwolf.org>).
* Fixed README.Debian path to configure.pl. Closes: #313093 (thanks to
  Michael De Nil <michael@flex-it.be>).

[ Jonas Smedegaard ]
* Acknowledge NMU. Closes: bug#322591.
* Bump up watch version, and adjust the default command (we have moved
  to SubVerSion).
* Add proto to URL in long description.
* User newer chown syntax in postinst (thanks to lintian).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_remove_eval.patch
 
1
diff -Nur awstats-6.4/wwwroot/cgi-bin/awstats.pl awstats-6.4.new/wwwroot/cgi-bin/awstats.pl
 
2
--- awstats-6.4/wwwroot/cgi-bin/awstats.pl      2005-08-11 18:20:39.000000000 +0200
 
3
+++ awstats-6.4.new/wwwroot/cgi-bin/awstats.pl  2005-08-11 18:21:14.000000000 +0200
 
4
@@ -625,8 +625,10 @@
 
5
 EOF
 
6
                        # Call to plugins' function AddHTMLStyles
 
7
                        foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLStyles'}})  {
 
8
-                               my $function="AddHTMLStyles_$pluginname()";
 
9
-                               eval("$function");
 
10
+#                              my $function="AddHTMLStyles_$pluginname()";
 
11
+#                              eval("$function");
 
12
+                               my $function="AddHTMLStyles_$pluginname";
 
13
+                &$function();
 
14
                        }
 
15
        
 
16
                        if ($BuildReportFormat eq 'xhtml' || $BuildReportFormat eq 'xml') { print ($ENV{'HTTP_USER_AGENT'}=~/Firebird/i?"//-->\n":"]]>\n"); }
 
17
@@ -660,8 +662,10 @@
 
18
 
 
19
        # Call to plugins' function AddHTMLBodyFooter
 
20
        foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyFooter'}})  {
 
21
-               my $function="AddHTMLBodyFooter_$pluginname()";
 
22
-               eval("$function");
 
23
+#              my $function="AddHTMLBodyFooter_$pluginname()";
 
24
+#              eval("$function");
 
25
+               my $function="AddHTMLBodyFooter_$pluginname";
 
26
+            &$function();
 
27
        }
 
28
 
 
29
                if ($FrameName ne 'index' && $FrameName ne 'mainleft') {
 
30
@@ -3254,15 +3258,19 @@
 
31
                         # The plugin for this section was loaded
 
32
                                    $found=1;
 
33
                                my $issectiontoload=$SectionsToLoad{"plugin_$pluginname"};
 
34
-                                   my $function="SectionReadHistory_$pluginname(\$issectiontoload,\$readxml,\$xmleb,\$countlines)";
 
35
-                                   eval("$function");
 
36
+#                                  my $function="SectionReadHistory_$pluginname(\$issectiontoload,\$readxml,\$xmleb,\$countlines)";
 
37
+#                                  eval("$function");
 
38
+                                   my $function="SectionReadHistory_$pluginname";
 
39
+                                   &$function($issectiontoload,$readxml,$xmleb,$countlines);
 
40
                                        delete $SectionsToLoad{"plugin_$pluginname"};
 
41
                                        if ($SectionsToSave{"plugin_$pluginname"}) {
 
42
                                                Save_History("plugin_$pluginname",$year,$month);
 
43
                                                delete $SectionsToSave{"plugin_$pluginname"};
 
44
                                                if ($withpurge) {
 
45
-                                       my $function="SectionInitHashArray_$pluginname()";
 
46
-                                       eval("$function");
 
47
+#                                      my $function="SectionInitHashArray_$pluginname()";
 
48
+#                                      eval("$function");
 
49
+                                       my $function="SectionInitHashArray_$pluginname";
 
50
+                                       &$function();
 
51
                                                }
 
52
                                        }
 
53
                         last;
 
54
@@ -3977,8 +3985,10 @@
 
55
        if ($AtLeastOneSectionPlugin && $sectiontosave =~ /^plugin_(\w+)$/i)   {
 
56
            my $pluginname=$1;
 
57
            if ($PluginsLoaded{'SectionInitHashArray'}{"$pluginname"})  {
 
58
-                   my $function="SectionWriteHistory_$pluginname(\$xml,\$xmlbb,\$xmlbs,\$xmlbe,\$xmlrb,\$xmlrs,\$xmlre,\$xmleb,\$xmlee)";
 
59
-                   eval("$function");
 
60
+#              my $function="SectionWriteHistory_$pluginname(\$xml,\$xmlbb,\$xmlbs,\$xmlbe,\$xmlrb,\$xmlrs,\$xmlre,\$xmleb,\$xmlee)";
 
61
+#                  eval("$function");
 
62
+                   my $function="SectionWriteHistory_$pluginname";
 
63
+                   &$function($xml,$xmlbb,$xmlbs,$xmlbe,$xmlrb,$xmlrs,$xmlre,$xmleb,$xmlee);
 
64
         }
 
65
     }
 
66
 
 
67
@@ -4203,8 +4213,10 @@
 
68
                %{'_section_' . $ix . '_l'} = %{'_section_' . $ix . '_p'} = ();
 
69
        }
 
70
        foreach my $pluginname (keys %{$PluginsLoaded{'SectionInitHashArray'}})  {
 
71
-               my $function="SectionInitHashArray_$pluginname()";
 
72
-               eval("$function");
 
73
+#              my $function="SectionInitHashArray_$pluginname()";
 
74
+#              eval("$function");
 
75
+               my $function="SectionInitHashArray_$pluginname";
 
76
+               &$function();
 
77
     }
 
78
 }
 
79
 
 
80
@@ -4788,8 +4800,10 @@
 
81
        my $user=shift;
 
82
        # Call to plugins' function ShowInfoUser
 
83
        foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoUser'}})  {
 
84
-               my $function="ShowInfoUser_$pluginname('$user')";
 
85
-               eval("$function");
 
86
+#              my $function="ShowInfoUser_$pluginname('$user')";
 
87
+#              eval("$function");
 
88
+               my $function="ShowInfoUser_$pluginname";
 
89
+               &$function($user);
 
90
        }
 
91
 }
 
92
 
 
93
@@ -4804,8 +4818,10 @@
 
94
        my $user=shift;
 
95
        # Call to plugins' function ShowInfoCluster
 
96
        foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoCluster'}})  {
 
97
-               my $function="ShowInfoCluster_$pluginname('$user')";
 
98
-               eval("$function");
 
99
+#              my $function="ShowInfoCluster_$pluginname('$user')";
 
100
+#              eval("$function");
 
101
+               my $function="ShowInfoCluster_$pluginname";
 
102
+               &$function($user);
 
103
        }
 
104
 }
 
105
 
 
106
@@ -4820,8 +4836,10 @@
 
107
        my $host=shift;
 
108
        # Call to plugins' function ShowInfoHost
 
109
        foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoHost'}})  {
 
110
-               my $function="ShowInfoHost_$pluginname('$host')";
 
111
-               eval("$function");
 
112
+#              my $function="ShowInfoHost_$pluginname('$host')";
 
113
+#              eval("$function");
 
114
+               my $function="ShowInfoHost_$pluginname";
 
115
+               &$function($host);
 
116
        }
 
117
 }
 
118
 
 
119
@@ -4838,8 +4856,10 @@
 
120
 
 
121
        # Call to plugins' function ShowInfoURL
 
122
        foreach my $pluginname (keys %{$PluginsLoaded{'ShowInfoURL'}})  {
 
123
-               my $function="ShowInfoURL_$pluginname('$url')";
 
124
-               eval("$function");
 
125
+#              my $function="ShowInfoURL_$pluginname('$url')";
 
126
+#              eval("$function");
 
127
+               my $function="ShowInfoURL_$pluginname";
 
128
+               &$function($url);
 
129
        }
 
130
 
 
131
        if (length($nompage)>$MaxLengthOfShownURL) { $nompage=substr($nompage,0,$MaxLengthOfShownURL)."..."; }
 
132
@@ -5154,8 +5174,10 @@
 
133
     my $linetitle=0;
 
134
        # Call to plugins' function AddHTMLMenuLink
 
135
        foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuLink'}})  {
 
136
-               my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)";
 
137
-               eval("$function");
 
138
+#              my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)";
 
139
+#              eval("$function");
 
140
+               my $function="AddHTMLMenuLink_$pluginname";
 
141
+               &$function($categ,$menu,$menulink,$menutext);
 
142
        }
 
143
     foreach my $key (%$menu) { if ($menu->{$key}>0) { $linetitle++; last; } }
 
144
        if (! $linetitle) { return; }
 
145
@@ -5723,8 +5745,10 @@
 
146
 
 
147
 # AWStats output is replaced by a plugin output
 
148
 if ($PluginMode) {
 
149
-       my $function="BuildFullHTMLOutput_$PluginMode()";
 
150
-       eval("$function");
 
151
+#      my $function="BuildFullHTMLOutput_$PluginMode()";
 
152
+#      eval("$function");
 
153
+       my $function="BuildFullHTMLOutput_$PluginMode";
 
154
+       &$function();
 
155
        if ($? || $@) { error("$@"); }
 
156
        &html_end(0);
 
157
        exit 0; 
 
158
@@ -6623,8 +6647,10 @@
 
159
                        elsif ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoip'}) { $Domain=GetCountryCodeByAddr_geoip($HostResolved); }
 
160
             if ($AtLeastOneSectionPlugin) {
 
161
                        foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}})  {
 
162
-                               my $function="SectionProcessIp_$pluginname(\$HostResolved)";
 
163
-                               eval("$function");
 
164
+#                              my $function="SectionProcessIp_$pluginname(\$HostResolved)";
 
165
+#                              eval("$function");
 
166
+                               my $function="SectionProcessIp_$pluginname";
 
167
+                               &$function($HostResolved);
 
168
                 }
 
169
                    }
 
170
                }
 
171
@@ -6638,8 +6664,10 @@
 
172
                                elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; }
 
173
                 if ($AtLeastOneSectionPlugin) {
 
174
                        foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}})  {
 
175
-                               my $function="SectionProcessIp_$pluginname(\$Host)";
 
176
-                               eval("$function");
 
177
+#                              my $function="SectionProcessIp_$pluginname(\$Host)";
 
178
+#                              eval("$function");
 
179
+                               my $function="SectionProcessIp_$pluginname";
 
180
+                               &$function($Host);
 
181
                     }
 
182
                 }
 
183
                        }
 
184
@@ -6649,8 +6677,10 @@
 
185
                                elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; }
 
186
                 if ($AtLeastOneSectionPlugin) {
 
187
                        foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessHostname'}})  {
 
188
-                               my $function="SectionProcessHostname_$pluginname(\$HostResolved)";
 
189
-                               eval("$function");
 
190
+#                              my $function="SectionProcessHostname_$pluginname(\$HostResolved)";
 
191
+#                              eval("$function");
 
192
+                               my $function="SectionProcessHostname_$pluginname";
 
193
+                               &$function($HostResolved);
 
194
                     }
 
195
                 }
 
196
                        }
 
197
@@ -7319,8 +7349,10 @@
 
198
 
 
199
        # Call to plugins' function AddHTMLBodyHeader
 
200
        foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyHeader'}})  {
 
201
-               my $function="AddHTMLBodyHeader_$pluginname()";
 
202
-               eval("$function");
 
203
+#              my $function="AddHTMLBodyHeader_$pluginname()";
 
204
+#              eval("$function");
 
205
+               my $function="AddHTMLBodyHeader_$pluginname";
 
206
+               &$function();
 
207
        }
 
208
 
 
209
     my $WIDTHMENU1=($FrameName eq 'mainleft'?$FRAMEWIDTH:150);
 
210
@@ -7462,8 +7494,10 @@
 
211
     
 
212
        # Call to plugins' function AddHTMLMenuHeader
 
213
        foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuHeader'}})  {
 
214
-               my $function="AddHTMLMenuHeader_$pluginname()";
 
215
-               eval("$function");
 
216
+#              my $function="AddHTMLMenuHeader_$pluginname()";
 
217
+#              eval("$function");
 
218
+               my $function="AddHTMLMenuHeader_$pluginname";
 
219
+               &$function();
 
220
        }
 
221
 
 
222
        # MENU
 
223
@@ -7572,8 +7606,10 @@
 
224
 
 
225
        # Call to plugins' function AddHTMLMenuFooter
 
226
        foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuFooter'}})  {
 
227
-               my $function="AddHTMLMenuFooter_$pluginname()";
 
228
-               eval("$function");
 
229
+#              my $function="AddHTMLMenuFooter_$pluginname()";
 
230
+#              eval("$function");
 
231
+               my $function="AddHTMLMenuFooter_$pluginname";
 
232
+               &$function();
 
233
        }
 
234
 
 
235
        # Exit if left frame
 
236
@@ -7666,8 +7702,10 @@
 
237
 
 
238
        # Call to plugins' function AddHTMLContentHeader
 
239
        foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLContentHeader'}})  {
 
240
-               my $function="AddHTMLContentHeader_$pluginname()";
 
241
-               eval("$function");
 
242
+#              my $function="AddHTMLContentHeader_$pluginname()";
 
243
+#              eval("$function");
 
244
+               my $function="AddHTMLContentHeader_$pluginname";
 
245
+               &$function();
 
246
        }
 
247
 
 
248
        # Output particular part
 
249
@@ -7946,8 +7984,10 @@
 
250
        if ($HTMLOutput{'urldetail'} || $HTMLOutput{'urlentry'} || $HTMLOutput{'urlexit'}) {
 
251
                # Call to plugins' function ShowPagesFilter
 
252
                foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesFilter'}})  {
 
253
-                       my $function="ShowPagesFilter_$pluginname()";
 
254
-                       eval("$function");
 
255
+#                      my $function="ShowPagesFilter_$pluginname()";
 
256
+#                      eval("$function");
 
257
+                       my $function="ShowPagesFilter_$pluginname";
 
258
+                       &$function();
 
259
                }
 
260
                print "$Center<a name=\"urls\">&nbsp;</a><br />\n";
 
261
                # Show filter form
 
262
@@ -7977,8 +8017,10 @@
 
263
                if ($ShowPagesStats =~ /X/i) { print "<th bgcolor=\"#$color_x\" width=\"80\">$Message[116]</th>"; }
 
264
                # Call to plugins' function ShowPagesAddField
 
265
                foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
 
266
-                       my $function="ShowPagesAddField_$pluginname('title')";
 
267
-                       eval("$function");
 
268
+#                      my $function="ShowPagesAddField_$pluginname('title')";
 
269
+#                      eval("$function");
 
270
+                       my $function="ShowPagesAddField_$pluginname()";
 
271
+                       &$function('title');
 
272
                }
 
273
                print "<th>&nbsp;</th></tr>\n";
 
274
                $total_p=$total_k=$total_e=$total_x=0;
 
275
@@ -8010,8 +8052,10 @@
 
276
                        if ($ShowPagesStats =~ /X/i) { print "<td>".($_url_x{$key}?$_url_x{$key}:"&nbsp;")."</td>"; }
 
277
                        # Call to plugins' function ShowPagesAddField
 
278
                        foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
 
279
-                               my $function="ShowPagesAddField_$pluginname('$key')"; 
 
280
-                               eval("$function");
 
281
+#                              my $function="ShowPagesAddField_$pluginname('$key')"; 
 
282
+#                              eval("$function");
 
283
+                               my $function="ShowPagesAddField_$pluginname"; 
 
284
+                               &$function($key);
 
285
                        }
 
286
                        print "<td class=\"aws\">";
 
287
                        # alt and title are not provided to reduce page size
 
288
@@ -8039,8 +8083,10 @@
 
289
                        if ($ShowPagesStats =~ /X/i) { print "<td>".($rest_x?$rest_x:"&nbsp;")."</td>"; }
 
290
                        # Call to plugins' function ShowPagesAddField
 
291
                        foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
 
292
-                               my $function="ShowPagesAddField_$pluginname('')";
 
293
-                               eval("$function");
 
294
+#                              my $function="ShowPagesAddField_$pluginname('')";
 
295
+#                              eval("$function");
 
296
+                               my $function="ShowPagesAddField_$pluginname";
 
297
+                               &$function('');
 
298
                        }
 
299
                        print "<td>&nbsp;</td></tr>\n";
 
300
                }
 
301
@@ -8485,8 +8531,10 @@
 
302
        if ($htmloutput =~ /^plugin_(\w+)$/) {
 
303
                my $pluginname=$1;
 
304
                print "$Center<a name=\"plugin_$pluginname\">&nbsp;</a><br />";
 
305
-                       my $function="AddHTMLGraph_$pluginname()";
 
306
-                       eval("$function");
 
307
+#                      my $function="AddHTMLGraph_$pluginname()";
 
308
+#                      eval("$function");
 
309
+                       my $function="AddHTMLGraph_$pluginname";
 
310
+                       &$function();
 
311
                &html_end(1);
 
312
        }
 
313
     }
 
314
@@ -9592,8 +9640,10 @@
 
315
                        if ($ShowPagesStats =~ /X/i) { print "<th bgcolor=\"#$color_x\" width=\"80\">$Message[116]</th>"; }
 
316
                        # Call to plugins' function ShowPagesAddField
 
317
                        foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
 
318
-                               my $function="ShowPagesAddField_$pluginname('title')";
 
319
-                               eval("$function");
 
320
+#                              my $function="ShowPagesAddField_$pluginname('title')";
 
321
+#                              eval("$function");
 
322
+                               my $function="ShowPagesAddField_$pluginname";
 
323
+                               &$function('title');
 
324
                        }
 
325
                        print "<th>&nbsp;</th></tr>\n";
 
326
                        $total_p=$total_e=$total_x=$total_k=0;
 
327
@@ -9624,8 +9674,10 @@
 
328
                                if ($ShowPagesStats =~ /X/i) { print "<td>".($_url_x{$key}?$_url_x{$key}:"&nbsp;")."</td>"; }
 
329
                                # Call to plugins' function ShowPagesAddField
 
330
                                foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
 
331
-                                       my $function="ShowPagesAddField_$pluginname('$key')";
 
332
-                                       eval("$function");
 
333
+#                                      my $function="ShowPagesAddField_$pluginname('$key')";
 
334
+#                                      eval("$function");
 
335
+                                       my $function="ShowPagesAddField_$pluginname";
 
336
+                                       &$function($key);
 
337
                                }
 
338
                                print "<td class=\"aws\">";
 
339
                                if ($ShowPagesStats =~ /P/i && $LogType ne 'F')    { print "<img src=\"$DirIcons\/other\/$BarPng{'hp'}\" width=\"$bredde_p\" height=\"4\"".AltTitle("")." /><br />"; }
 
340
@@ -9653,8 +9705,10 @@
 
341
                                if ($ShowPagesStats =~ /X/i) { print "<td>".($rest_x?$rest_x:"&nbsp;")."</td>"; }
 
342
                                # Call to plugins' function ShowPagesAddField
 
343
                                foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
 
344
-                                       my $function="ShowPagesAddField_$pluginname('')";
 
345
-                                       eval("$function");
 
346
+#                                      my $function="ShowPagesAddField_$pluginname('')";
 
347
+#                                      eval("$function");
 
348
+                                       my $function="ShowPagesAddField_$pluginname";
 
349
+                                       &$function('');
 
350
                                }
 
351
                                print "<td>&nbsp;</td></tr>\n";
 
352
                        }