/[smeserver]/rpms/e-smith-hosts/sme8/e-smith-hosts-2.2.0-fix-speechmarks2.patch
ViewVC logotype

Contents of /rpms/e-smith-hosts/sme8/e-smith-hosts-2.2.0-fix-speechmarks2.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Mon Nov 29 17:20:24 2010 UTC (13 years, 6 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-hosts-2_2_0-13_el5_sme, e-smith-hosts-2_2_0-10_el5_sme, e-smith-hosts-2_2_0-9_el5_sme, e-smith-hosts-2_2_0-12_el5_sme, e-smith-hosts-2_2_0-11_el5_sme, e-smith-hosts-2_2_0-8_el5_sme, HEAD
* Mon Nov 29 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-8.sme
- Rework previous fix and escape comment field in server-manager forms [SME: 6408]

1 diff -up e-smith-hosts-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm.fix-speechmark e-smith-hosts-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm
2 --- e-smith-hosts-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm.fix-speechmark 2010-11-29 18:05:49.000000000 +0100
3 +++ e-smith-hosts-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/hostentries.pm 2010-11-29 18:10:36.000000000 +0100
4 @@ -33,6 +33,7 @@ use File::Basename;
5 use Exporter;
6 use Carp;
7 use Net::IPv4Addr;
8 +use HTML::Entities;
9
10 our @ISA = qw(esmith::FormMagick Exporter);
11
12 @@ -245,7 +246,7 @@ sub print_host_row
13 $self->print_td($self->localise($host_record->prop('HostType')) || "&nbsp;");
14 $self->print_td($ip);
15 $self->print_td($host_record->prop('MACAddress') || "&nbsp;");
16 - $self->print_td($host_record->prop('Comment') || "&nbsp;");
17 + $self->print_td(encode_entities($host_record->prop('Comment')) || "&nbsp;");
18 my $static = $host_record->prop('static') || "no";
19 if ($static ne 'yes') {
20 my $propstring = $self->build_host_cgi_params($host_record->key(), $host_record->props());
21 @@ -289,7 +290,7 @@ sub build_host_cgi_params {
22 global_ip => $oldprops{ExternalIP},
23 ethernet_address => $oldprops{MACAddress},
24 hosttype => $oldprops{HostType},
25 - comment => $oldprops{Comment},
26 + comment => encode_entities($oldprops{Comment}),
27 );
28
29 return $self->props_to_query_string(\%props);

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed