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